diff options
| author | anholt <anholt@FreeBSD.org> | 2003-10-14 08:45:30 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-10-14 08:45:30 +0800 |
| commit | 05611a481f84d33cd38b361b1adb24f628ee8415 (patch) | |
| tree | c964be0abbaaf8312f67211fca665e3290c7e13b /x11 | |
| parent | 03b2007d69c21f615a3c5f322670c3c1ac137b32 (diff) | |
| download | freebsd-ports-gnome-05611a481f84d33cd38b361b1adb24f628ee8415.tar.gz freebsd-ports-gnome-05611a481f84d33cd38b361b1adb24f628ee8415.tar.zst freebsd-ports-gnome-05611a481f84d33cd38b361b1adb24f628ee8415.zip | |
Fix XFree86-4-clients build. It was failing depending on lib*.a which weren't
being built due to the split build. Remove the dependencies on them, and it'll
pick them up from ${X11BASE}/lib. I don't know why this broke now but worked
in the past.
Reported by: everyone
Tested on: ref5 (libraries,clients)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-clients/scripts/configure | 1 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-Imake.rules | 25 |
2 files changed, 23 insertions, 3 deletions
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index 6c959040d2ba..aa0c4e7dd580 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -67,6 +67,7 @@ echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF echo "#define DontUseLibPathVar YES" >> $LOCALDEF echo "#define PreloadSetup" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF +echo "#define UseInstalledLibraries YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF diff --git a/x11/XFree86-4-libraries/files/patch-Imake.rules b/x11/XFree86-4-libraries/files/patch-Imake.rules index edd940aa23bd..deea1cb886a6 100644 --- a/x11/XFree86-4-libraries/files/patch-Imake.rules +++ b/x11/XFree86-4-libraries/files/patch-Imake.rules @@ -1,5 +1,5 @@ ---- config/cf/Imake.rules.orig Thu Jan 2 14:43:27 2003 -+++ config/cf/Imake.rules Thu Jan 2 14:49:12 2003 +--- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002 ++++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003 @@ -1406,7 +1406,7 @@ * this Imakefile is within the source tree. */ @@ -36,7 +36,26 @@ #define ImakeDependency(target) /**/ #else #define ImakeDependency(target) @@\ -@@ -3126,6 +3126,9 @@ +@@ -2066,11 +2066,18 @@ + * ProjectUnsharedLibReferences - variables for unshared libraries + */ + #ifndef ProjectUnsharedLibReferences ++#if defined(UseInstalledLibraries) ++#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ ++Concat3(DEP,varname,LIB) = @@\ ++Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ ++LintLibReferences(varname,libname,libsource) ++#else + #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\ + Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\ + Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\ + LintLibReferences(varname,libname,libsource) + #endif ++#endif + + /* + * ProjectUnsharedFontLibReferences - unshared font libraries +@@ -3126,6 +3133,9 @@ #ifdef UseInstalled #define ImakeSubCmdHelper $(IMAKE_CMD) |