aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-toolkits/qt23/Makefile13
-rw-r--r--x11-toolkits/qt23/files/objprelink.patch20
-rw-r--r--x11-toolkits/qt23/files/patch-aa15
-rw-r--r--x11-toolkits/qt30/Makefile13
-rw-r--r--x11-toolkits/qt30/files/objprelink.patch20
-rw-r--r--x11-toolkits/qt30/files/patch-aa15
-rw-r--r--x11-toolkits/qt31/Makefile13
-rw-r--r--x11-toolkits/qt31/files/objprelink.patch20
-rw-r--r--x11-toolkits/qt31/files/patch-aa15
-rw-r--r--x11-toolkits/qt32/Makefile13
-rw-r--r--x11-toolkits/qt32/files/objprelink.patch20
-rw-r--r--x11-toolkits/qt32/files/patch-aa15
-rw-r--r--x11-toolkits/qt33/Makefile13
-rw-r--r--x11-toolkits/qt33/files/objprelink.patch20
-rw-r--r--x11-toolkits/qt33/files/patch-aa15
15 files changed, 180 insertions, 60 deletions
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 800a6302c3ac..b43fe6c79f49 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -19,7 +19,9 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
+.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -82,6 +84,17 @@ 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; \
diff --git a/x11-toolkits/qt23/files/objprelink.patch b/x11-toolkits/qt23/files/objprelink.patch
new file mode 100644
index 000000000000..d6681cb74790
--- /dev/null
+++ b/x11-toolkits/qt23/files/objprelink.patch
@@ -0,0 +1,20 @@
+--- 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) && \
diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa
index d30908925332..bc5939bc401f 100644
--- a/x11-toolkits/qt23/files/patch-aa
+++ b/x11-toolkits/qt23/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001
-+++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001
+--- configs/freebsd-g++-shared Fri Jan 4 21:35:53 2002
++++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:33 2002
@@ -6,7 +6,7 @@
# Compiling with support libraries
@@ -18,15 +18,6 @@
SYSCONF_LIBS_QT_OPENGL =
# OpenGL
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -32,7 +32,7 @@
- SYSCONF_LIBS_YACC =
-
- # Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++
- SYSCONF_LFLAGS =
- SYSCONF_LIBS =
-
@@ -46,7 +46,7 @@
SYSCONF_LIBS_THREAD =
@@ -43,7 +34,7 @@
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \
++SYSCONF_LINK_LIB_SHARED = \
+ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 800a6302c3ac..b43fe6c79f49 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -19,7 +19,9 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
+.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -82,6 +84,17 @@ 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; \
diff --git a/x11-toolkits/qt30/files/objprelink.patch b/x11-toolkits/qt30/files/objprelink.patch
new file mode 100644
index 000000000000..d6681cb74790
--- /dev/null
+++ b/x11-toolkits/qt30/files/objprelink.patch
@@ -0,0 +1,20 @@
+--- 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) && \
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa
index d30908925332..bc5939bc401f 100644
--- a/x11-toolkits/qt30/files/patch-aa
+++ b/x11-toolkits/qt30/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001
-+++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001
+--- configs/freebsd-g++-shared Fri Jan 4 21:35:53 2002
++++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:33 2002
@@ -6,7 +6,7 @@
# Compiling with support libraries
@@ -18,15 +18,6 @@
SYSCONF_LIBS_QT_OPENGL =
# OpenGL
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -32,7 +32,7 @@
- SYSCONF_LIBS_YACC =
-
- # Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++
- SYSCONF_LFLAGS =
- SYSCONF_LIBS =
-
@@ -46,7 +46,7 @@
SYSCONF_LIBS_THREAD =
@@ -43,7 +34,7 @@
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \
++SYSCONF_LINK_LIB_SHARED = \
+ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 800a6302c3ac..b43fe6c79f49 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -19,7 +19,9 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
+.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -82,6 +84,17 @@ 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; \
diff --git a/x11-toolkits/qt31/files/objprelink.patch b/x11-toolkits/qt31/files/objprelink.patch
new file mode 100644
index 000000000000..d6681cb74790
--- /dev/null
+++ b/x11-toolkits/qt31/files/objprelink.patch
@@ -0,0 +1,20 @@
+--- 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) && \
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index d30908925332..bc5939bc401f 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001
-+++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001
+--- configs/freebsd-g++-shared Fri Jan 4 21:35:53 2002
++++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:33 2002
@@ -6,7 +6,7 @@
# Compiling with support libraries
@@ -18,15 +18,6 @@
SYSCONF_LIBS_QT_OPENGL =
# OpenGL
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -32,7 +32,7 @@
- SYSCONF_LIBS_YACC =
-
- # Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++
- SYSCONF_LFLAGS =
- SYSCONF_LIBS =
-
@@ -46,7 +46,7 @@
SYSCONF_LIBS_THREAD =
@@ -43,7 +34,7 @@
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \
++SYSCONF_LINK_LIB_SHARED = \
+ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 800a6302c3ac..b43fe6c79f49 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -19,7 +19,9 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
+.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -82,6 +84,17 @@ 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; \
diff --git a/x11-toolkits/qt32/files/objprelink.patch b/x11-toolkits/qt32/files/objprelink.patch
new file mode 100644
index 000000000000..d6681cb74790
--- /dev/null
+++ b/x11-toolkits/qt32/files/objprelink.patch
@@ -0,0 +1,20 @@
+--- 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) && \
diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa
index d30908925332..bc5939bc401f 100644
--- a/x11-toolkits/qt32/files/patch-aa
+++ b/x11-toolkits/qt32/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001
-+++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001
+--- configs/freebsd-g++-shared Fri Jan 4 21:35:53 2002
++++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:33 2002
@@ -6,7 +6,7 @@
# Compiling with support libraries
@@ -18,15 +18,6 @@
SYSCONF_LIBS_QT_OPENGL =
# OpenGL
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -32,7 +32,7 @@
- SYSCONF_LIBS_YACC =
-
- # Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++
- SYSCONF_LFLAGS =
- SYSCONF_LIBS =
-
@@ -46,7 +46,7 @@
SYSCONF_LIBS_THREAD =
@@ -43,7 +34,7 @@
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \
++SYSCONF_LINK_LIB_SHARED = \
+ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 800a6302c3ac..b43fe6c79f49 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -19,7 +19,9 @@ MAINTAINER?= kde@FreeBSD.org
LIB_DEPENDS= mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
+.if ${MACHINE_ARCH} == "i386" && !defined(NO_QT_OBJPRELINK)
BUILD_DEPENDS= objprelink:${PORTSDIR}/devel/objprelink
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_MESA= yes
@@ -82,6 +84,17 @@ 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; \
diff --git a/x11-toolkits/qt33/files/objprelink.patch b/x11-toolkits/qt33/files/objprelink.patch
new file mode 100644
index 000000000000..d6681cb74790
--- /dev/null
+++ b/x11-toolkits/qt33/files/objprelink.patch
@@ -0,0 +1,20 @@
+--- 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) && \
diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa
index d30908925332..bc5939bc401f 100644
--- a/x11-toolkits/qt33/files/patch-aa
+++ b/x11-toolkits/qt33/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared Wed Jun 13 03:56:43 2001
-+++ configs/freebsd-g++-shared.new Sun Dec 2 19:22:52 2001
+--- configs/freebsd-g++-shared Fri Jan 4 21:35:53 2002
++++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:33 2002
@@ -6,7 +6,7 @@
# Compiling with support libraries
@@ -18,15 +18,6 @@
SYSCONF_LIBS_QT_OPENGL =
# OpenGL
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -32,7 +32,7 @@
- SYSCONF_LIBS_YACC =
-
- # Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++
- SYSCONF_LFLAGS =
- SYSCONF_LIBS =
-
@@ -46,7 +46,7 @@
SYSCONF_LIBS_THREAD =
@@ -43,7 +34,7 @@
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \
++SYSCONF_LINK_LIB_SHARED = \
+ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 12:33:57 +0000