diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-11-20 12:18:17 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-11-20 12:18:17 +0000 |
| commit | 97ec9e3e03d27d22fe17b54acd2844400a671e3d (patch) | |
| tree | 4d8751dd97f5f61d74e47b0fca2e52bcc18d5f77 /x11-toolkits/qt32/files | |
| parent | 17ce41846588c66a510d5ea3ecb664e67644680b (diff) | |
Notes
Diffstat (limited to 'x11-toolkits/qt32/files')
| -rw-r--r-- | x11-toolkits/qt32/files/patch-aa | 21 | ||||
| -rw-r--r-- | x11-toolkits/qt32/files/patch-af | 19 |
2 files changed, 31 insertions, 9 deletions
diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa index b95cbe905e2e..3d4d707124a0 100644 --- a/x11-toolkits/qt32/files/patch-aa +++ b/x11-toolkits/qt32/files/patch-aa @@ -1,6 +1,6 @@ ---- configs/freebsd-g++-shared Sun Sep 10 18:44:24 2000 -+++ configs/freebsd-g++-shared.new Sun Sep 10 18:44:53 2000 -@@ -21,7 +21,7 @@ +--- configs/freebsd-g++-shared.orig Wed Oct 4 12:55:10 2000 ++++ configs/freebsd-g++-shared Sat Nov 18 20:02:27 2000 +@@ -22,7 +22,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,7 +18,7 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -55,16 +55,14 @@ +@@ -56,16 +56,14 @@ # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) # SYSCONF_LINK_SHLIB = g++ @@ -38,3 +38,14 @@ # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a +@@ -76,8 +74,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 -O2 +-SYSCONF_CFLAGS = -pipe -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 + # 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/qt32/files/patch-af b/x11-toolkits/qt32/files/patch-af index b231b8d9f0be..0e02a1aefefc 100644 --- a/x11-toolkits/qt32/files/patch-af +++ b/x11-toolkits/qt32/files/patch-af @@ -1,6 +1,6 @@ ---- configs/freebsd-g++-static Sat Sep 16 14:47:56 2000 -+++ configs/freebsd-g++-static.new Sat Sep 16 14:48:06 2000 -@@ -21,7 +21,7 @@ +--- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 ++++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 +@@ -22,7 +22,7 @@ SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib @@ -9,7 +9,7 @@ SYSCONF_LIBS_QT_OPENGL = # OpenGL SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ SYSCONF_LIBS_THREAD = # Meta-object compiler @@ -18,3 +18,14 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic +@@ -76,8 +76,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 -O2 +-SYSCONF_CFLAGS = -pipe -O2 ++SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 ++SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O2 + SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) + SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) + # Compiling library source |