diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-09-11 13:33:55 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-09-11 13:33:55 +0000 |
| commit | 1d551159aabd6a8eccb1d5ca4fc0fabbf498fd13 (patch) | |
| tree | f4fdbf85318dcd80c5530efa9e469eb2baf39f8c | |
| parent | Update to 0.98. (diff) | |
Exorcise the ghost of objprelink, which was killed and buried with kde2.
This should unbreak some things, like some errors from portsdb -Uu, as well
as the port build itself.
Notes
Notes:
svn path=/head/; revision=66128
| -rw-r--r-- | x11-toolkits/qt23/Makefile | 18 | ||||
| -rw-r--r-- | x11-toolkits/qt23/files/objprelink.patch | 20 |
2 files changed, 0 insertions, 38 deletions
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index c6fe54d1abdd..9ff3d5ba1d32 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -61,13 +61,6 @@ PLIST_SUB+= SHARED="" STATIC="@comment " .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500029 -NO_QT_OBJPRELINK= yes -.endif -.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK) -BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink -.endif - .if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION) CFLAGS+= -O0 .endif @@ -95,17 +88,6 @@ pre-fetch: qt-pre-configure: @true -post-patch: -.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK) -.if !exists(${WRKDIR}/.${PKGNAME}.objprelink_patched) - @echo "Doing special objprelink patching..." - cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/objprelink.patch - ${TOUCH} ${WRKDIR}/.${PKGNAME}.objprelink_patched -.else - @echo "Already did the objprelink patching, skipping..." -.endif -.endif - pre-configure: qt-pre-configure ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \ diff --git a/x11-toolkits/qt23/files/objprelink.patch b/x11-toolkits/qt23/files/objprelink.patch deleted file mode 100644 index d6681cb74790..000000000000 --- a/x11-toolkits/qt23/files/objprelink.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configs/freebsd-g++-shared Fri Jan 4 21:39:23 2002 -+++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:23 2002 -@@ -32,7 +32,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = g++ -+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -@@ -58,7 +58,7 @@ - # - SYSCONF_LINK_SHLIB = g++ - SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) --SYSCONF_LINK_LIB_SHARED = \ -+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \ - $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ |