mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-01 22:05:08 +00:00
Code Issues Releases Activity
97e0142d86
freebsd-ports/x11-toolkits/qt33/files/patch-aa

87 lines
3.1 KiB
Plaintext
Raw Normal View History

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
--- configs/freebsd-g++-shared.orig Tue Nov 17 15:19:01 1998
+++ configs/freebsd-g++-shared Thu Feb 25 09:03:29 1999
@@ -1,30 +1,30 @@
# Compiling
-SYSCONF_CC = g++
+SYSCONF_CC = $(CXX)
# Compiling with support libraries
-SYSCONF_CFLAGS_X11 = -I/usr/X11R6/include
+SYSCONF_CFLAGS_X11 = -I$(X11BASE)/include
SYSCONF_CFLAGS_QT = -I$(QTDIR)/include
-SYSCONF_CFLAGS_OPENGL = -I/usr/X11R6/include
+SYSCONF_CFLAGS_OPENGL = -I$(X11BASE)/include
# Compiline YACC output
SYSCONF_CFLAGS_YACC = -Wno-unused -Wno-parentheses
# Linking with support libraries
# X11
-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
+SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib
SYSCONF_LIBS_X11 = -lX11 -lXext
# Qt, Qt+OpenGL
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
SYSCONF_LIBS_QT = -lqt
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
# Yacc
SYSCONF_LIBS_YACC =
# Linking applications
-SYSCONF_LINK = g++
+SYSCONF_LINK = $(CXX)
SYSCONF_LFLAGS =
SYSCONF_LIBS =
@@ -39,16 +39,27 @@
# - Place target in $(DESTDIR) - which has a trailing /
Convert to ELF and pickup a bunch of missing header files in pkg/PLIST.
1998-09-27 17:46:51 +00:00
# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
- 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++
+SYSCONF_LINK_SHLIB = $(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) \
+ -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
+ $(OBJECTS) $(OBJMOC) $(LIBS); \
+ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ cd $(DESTDIR); \
+ 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
+else
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).$(VER_MIN)
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); \
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)
+ 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
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
@@ -59,11 +70,11 @@
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
$(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
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_CFLAGS = -pipe -O2 -fno-strength-reduce
+SYSCONF_CFLAGS = $(CXXFLAGS) -fno-strength-reduce
- 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
-SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
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_CFLAGS_LIB = $(CXXFLAGS) -fno-strength-reduce -fPIC
- 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 shared-object source
-SYSCONF_CFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
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_CFLAGS_SHOBJ = $(CXXFLAGS) -fno-strength-reduce -fPIC
- 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
# Default link type (stati linking is still be used where required)
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
Reference in New Issue Copy Permalink