mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-04 22:33:27 +00:00
Code Issues Releases Activity
920ac3d3eb
freebsd-ports/x11-toolkits/qt31/files/patch-aa

91 lines
3.2 KiB
Plaintext
Raw Normal View History

New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
--- configs/freebsd-g++-shared.orig Tue Jul 20 11:45:01 1999
+++ configs/freebsd-g++-shared Thu Aug 12 21:26:28 1999
@@ -1,33 +1,33 @@
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# Compiling
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
-SYSCONF_CXX = g++
-SYSCONF_CC = gcc
+SYSCONF_CXX = $(SYS_CXX)
+SYSCONF_CC = $(SYS_CC)
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# Compiling with support libraries
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
-SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_X11 = -I$(X11BASE)/include
SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/include
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# Compiline YACC output
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# Linking with support libraries
# X11
-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
-SYSCONF_LIBS_QT = -lqt
+SYSCONF_LIBS_QT = -lqt2
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# Yacc
SYSCONF_LIBS_YACC =
# Linking applications
-SYSCONF_LINK = g++
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
+SYSCONF_LINK = $(SYS_CXX)
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
SYSCONF_LFLAGS =
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
-SYSCONF_LIBS =
+SYSCONF_LIBS = -lxpg4
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
# Link flags shared objects
SYSCONF_LFLAGS_SHOBJ = -shared
@@ -40,17 +40,27 @@
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
# - Place target in $(DESTDIR) - which has a trailing /
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks.
1998-07-20 16:51:18 +00:00
#
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
-SYSCONF_LINK_SHLIB = g++
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_SHLIB = $(SYS_CXX)
Convert to ELF and pickup a bunch of missing header files in pkg/PLIST.
1998-09-27 17:46:51 +00:00
+ifeq ($(PORTOBJFORMAT),elf)
Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after a short test period to make sure qt142 is an adequate replacement. Note #1: I changed it to install libqt.so.2.0. qt141 or newer are required for some software (most notably kde). We missed the chance to change the shlib number in qt141 so I'm doing it now. Note #2: After talking with Peter Wemm, I decided not to add extra -rpath directives. The fix for kdesupport and other build problems are forthcoming in ld.
1999-01-07 10:58:33 +00:00
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
$(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
+ -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
$(OBJECTS) $(OBJMOC) $(LIBS) && \
Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after a short test period to make sure qt142 is an adequate replacement. Note #1: I changed it to install libqt.so.2.0. qt141 or newer are required for some software (most notably kde). We missed the chance to change the shlib number in qt141 so I'm doing it now. Note #2: After talking with Peter Wemm, I decided not to add extra -rpath directives. The fix for kdesupport and other build problems are forthcoming in ld.
1999-01-07 10:58:33 +00:00
mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
cd $(DESTDIR) && \
- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after a short test period to make sure qt142 is an adequate replacement. Note #1: I changed it to install libqt.so.2.0. qt141 or newer are required for some software (most notably kde). We missed the chance to change the shlib number in qt141 so I'm doing it now. Note #2: After talking with Peter Wemm, I decided not to add extra -rpath directives. The fix for kdesupport and other build problems are forthcoming in ld.
1999-01-07 10:58:33 +00:00
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
- 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
+else
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)$(VER_PATCH)
+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) && \
Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after a short test period to make sure qt142 is an adequate replacement. Note #1: I changed it to install libqt.so.2.0. qt141 or newer are required for some software (most notably kde). We missed the chance to change the shlib number in qt141 so I'm doing it now. Note #2: After talking with Peter Wemm, I decided not to add extra -rpath directives. The fix for kdesupport and other build problems are forthcoming in ld.
1999-01-07 10:58:33 +00:00
+ rm -f lib$(TARGET).so; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
Convert to ELF and pickup a bunch of missing header files in pkg/PLIST.
1998-09-27 17:46:51 +00:00
+endif
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks.
1998-07-20 16:51:18 +00:00
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
@@ -61,8 +71,8 @@
partly adopt changes from PR - use CXX and CXXFLAGS if set additionally - use X11BASE still unsure if I should remove the dependancy from MESA... have to think over it when having time I think there was a problem, when building KDE with Mesa support and using a qt lib without ... Does somebody else have time to check ? PR: closes 8904 Submitted partly by: Alex Zepeda <garbanzo@hooked.net>
1999-02-25 08:25:17 +00:00
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks.
1998-07-20 16:51:18 +00:00
# Compiling application source
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
-SYSCONF_CXXFLAGS = -pipe -DNO_DEBUG -O2
-SYSCONF_CFLAGS = -pipe -DNO_DEBUG -O2
+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS) -DNO_DEBUG
+SYSCONF_CFLAGS = $(SYS_CXXFLAGS) -DNO_DEBUG
- Upgrade libqt to newest version 1.40 after repository copy. - The Makefile templates for all bsd's were broken, I fixed this for one installation target and already sent the patch to the qt folks.
1998-07-20 16:51:18 +00:00
# Compiling library source
New port of qt2.01. (From a repo-copy by asami). PR: 13199 Submitted by: Ryuichiro Imura <imura@cs.titech.ac.jp> Tested and modified by: Will Andrews <andrews@technologist.com>
1999-08-30 07:13:00 +00:00
SYSCONF_CXXFLAGS_LIB = -fPIC
SYSCONF_CFLAGS_LIB = -fPIC
Reference in New Issue Copy Permalink