diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2005-04-20 10:01:30 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2005-04-20 10:01:30 +0000 |
| commit | b4f9351a172f8e4e397e37176eabe4f6bc9bad40 (patch) | |
| tree | 0349e74c1f6fba8109776c1ea41896724fd8772a /x11-misc/xosview/files | |
| parent | taking it over (diff) | |
| download | gentoo-2-b4f9351a172f8e4e397e37176eabe4f6bc9bad40.tar.gz gentoo-2-b4f9351a172f8e4e397e37176eabe4f6bc9bad40.tar.bz2 gentoo-2-b4f9351a172f8e4e397e37176eabe4f6bc9bad40.zip | |
fix bug #74881
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-misc/xosview/files')
| -rw-r--r-- | x11-misc/xosview/files/xosview-emptyxpaths.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/x11-misc/xosview/files/xosview-emptyxpaths.patch b/x11-misc/xosview/files/xosview-emptyxpaths.patch new file mode 100644 index 000000000000..84ce057740a1 --- /dev/null +++ b/x11-misc/xosview/files/xosview-emptyxpaths.patch @@ -0,0 +1,95 @@ + +x_{includes,libraries} should be set *before* using them... + +--- config/configure.in.old ++++ config/configure.in +@@ -9,6 +9,21 @@ + ICE_CXX_BOOL + ICE_CXX_LONG_LONG + AC_PATH_X ++ ++# ++# On Gentoo and hpux10 both x_includes and x_libraries are set to "" ++# This causes compiler options like '-I' and '-L', which break ++# the build. So, we avoid empty strings here. ++# ++if test -z "$x_includes" ++then ++ x_includes=. ++fi ++if test -z "$x_libraries" ++then ++ x_libraries=. ++fi ++ + CXXFLAGS="$CXXFLAGS -I$x_includes" + case $host_os in + linux*) +@@ -306,21 +321,6 @@ + AC_SUBST(USE_MOD_VERSIONS) + dnl Check for usleep(). Currently, only HP-UX doesn't have it. + AC_CHECK_FUNCS(usleep) +- +-# +-# On hpux10 both x_includes and x_libraries seem to be set to "" +-# This causes compiler options like '-I' and '-L', which break +-# the build. So, we avoid empty strings here. +-# +-if test -z "$x_includes" +-then +- x_includes=. +-fi +-if test -z "$x_libraries" +-then +- x_libraries=. +-fi +- + + AC_SUBST(host_dir) + AC_SUBST(NetMeter_Default_Setting) +--- configure.old ++++ configure +@@ -3163,6 +3163,21 @@ + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + ++ ++# ++# On Gentoo and hpux10 both x_includes and x_libraries are set to "" ++# This causes compiler options like '-I' and '-L', which break ++# the build. So, we avoid empty strings here. ++# ++if test -z "$x_includes" ++then ++ x_includes=. ++fi ++if test -z "$x_libraries" ++then ++ x_libraries=. ++fi ++ + CXXFLAGS="$CXXFLAGS -I$x_includes" + case $host_os in + linux*) +@@ -5218,21 +5233,6 @@ + fi + done + +- +-# +-# On hpux10 both x_includes and x_libraries seem to be set to "" +-# This causes compiler options like '-I' and '-L', which break +-# the build. So, we avoid empty strings here. +-# +-if test -z "$x_includes" +-then +- x_includes=. +-fi +-if test -z "$x_libraries" +-then +- x_libraries=. +-fi +- + + + |