diff options
| author | nik <nik@FreeBSD.org> | 2001-06-22 16:44:48 +0800 |
|---|---|---|
| committer | nik <nik@FreeBSD.org> | 2001-06-22 16:44:48 +0800 |
| commit | 8b8b7155db6b6f08fa0a853ef0bd79a6e3be0f06 (patch) | |
| tree | c94e3c5886fb097b34041a4e7b1f622b86c09833 /x11-toolkits/qt31 | |
| parent | 1c3dc1f2fab2f343ed6cbda4653321e813564379 (diff) | |
| download | freebsd-ports-gnome-8b8b7155db6b6f08fa0a853ef0bd79a6e3be0f06.tar.gz freebsd-ports-gnome-8b8b7155db6b6f08fa0a853ef0bd79a6e3be0f06.tar.zst freebsd-ports-gnome-8b8b7155db6b6f08fa0a853ef0bd79a6e3be0f06.zip | |
Replicate the fixes in the other two patches when building qt23 with
debugging turned on.
Approved by: MAINTAINER
Diffstat (limited to 'x11-toolkits/qt31')
| -rw-r--r-- | x11-toolkits/qt31/files/patch-ag | 60 | ||||
| -rw-r--r-- | x11-toolkits/qt31/files/patch-ah | 31 |
2 files changed, 91 insertions, 0 deletions
diff --git a/x11-toolkits/qt31/files/patch-ag b/x11-toolkits/qt31/files/patch-ag new file mode 100644 index 000000000000..7cc73dc21a23 --- /dev/null +++ b/x11-toolkits/qt31/files/patch-ag @@ -0,0 +1,60 @@ +--- configs/freebsd-g++-shared-debug.orig Thu Jun 21 09:27:41 2001 ++++ configs/freebsd-g++-shared-debug Thu Jun 21 09:31:12 2001 +@@ -6,7 +6,7 @@ + + # Compiling with support libraries + SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include +-SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include ++SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) + SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include + + # Compiling YACC output +@@ -23,7 +23,7 @@ + SYSCONF_LIBS_X11 = -lXext -lX11 -lm + # Qt, Qt+OpenGL + SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib +-SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) ++SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD) + SYSCONF_LIBS_QT_OPENGL = + # OpenGL + SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -46,7 +46,7 @@ + SYSCONF_LIBS_THREAD = + + # Meta-object compiler +-SYSCONF_MOC = $(QTDIR)/bin/moc ++SYSCONF_MOC = $(QTDIR)/bin/moc2 + + # UI compiler + SYSCONF_UIC = $(QTDIR)/bin/uic +@@ -57,16 +57,14 @@ + # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) + # + SYSCONF_LINK_SHLIB = g++ +-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) ++SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) + SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + $(OBJECTS) $(OBJMOC) $(LIBS) && \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ + cd $(DESTDIR) && \ +- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ +- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ +- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ +- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) ++ rm -f lib$(TARGET).so;\ ++ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so + + # Linking static libraries + # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -77,8 +75,8 @@ + SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ + $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) + # Compiling application source +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -g +-SYSCONF_CFLAGS = -pipe -fno-exceptions -g ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g + # Default link type (static linking is still be used where required) + SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) + SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) diff --git a/x11-toolkits/qt31/files/patch-ah b/x11-toolkits/qt31/files/patch-ah new file mode 100644 index 000000000000..790190fef52f --- /dev/null +++ b/x11-toolkits/qt31/files/patch-ah @@ -0,0 +1,31 @@ +--- configs/freebsd-g++-static-debug.orig Thu Jun 21 09:32:21 2001 ++++ configs/freebsd-g++-static-debug Thu Jun 21 09:33:08 2001 +@@ -23,7 +23,7 @@ + SYSCONF_LIBS_X11 = -lXext -lX11 -lm + # Qt, Qt+OpenGL + SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib +-SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) ++SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) + SYSCONF_LIBS_QT_OPENGL = + # OpenGL + SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib +@@ -46,7 +46,7 @@ + SYSCONF_LIBS_THREAD = + + # Meta-object compiler +-SYSCONF_MOC = $(QTDIR)/bin/moc ++SYSCONF_MOC = $(QTDIR)/bin/moc2 + + # UI compiler + SYSCONF_UIC = $(QTDIR)/bin/uic +@@ -77,8 +77,8 @@ + SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ + $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) + # Compiling application source +-SYSCONF_CXXFLAGS = -pipe -fno-exceptions -g +-SYSCONF_CFLAGS = -pipe -fno-exceptions -g ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g + SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) + SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) + # Compiling library source |