openbsd-ports/x11/qt2/patches/patch-configs_openbsd-g++-shared-debug

--- configs/openbsd-g++-shared-debug.orig	Wed Oct  4 05:55:24 2000
+++ configs/openbsd-g++-shared-debug	Sat Oct  7 14:09:52 2000
@@ -1,12 +1,12 @@
 # Compiling
 INTERFACE_DECL_PATH 	= .
-SYSCONF_CXX		= g++
+SYSCONF_CXX		= $(SYS_CXX)
 SYSCONF_CC		= gcc
 
 # Compiling with support libraries
-SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include -I/usr/local/include
 SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_OPENGL	= -I/usr/local/include -I/usr/X11R6/include
 
 # Compiling YACC output
 SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
@@ -18,30 +18,30 @@
 
 # Linking with support libraries
 # X11
-SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib -L/usr/local/lib
 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_OPENGL	= 
 # OpenGL
-SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL	= -L/usr/local/lib -L/usr/X11R6/lib
 SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
 # Yacc
 SYSCONF_LIBS_YACC	= 
 
 # Linking applications
-SYSCONF_LINK		= g++
-SYSCONF_LFLAGS		= 
-SYSCONF_LIBS		= 
+SYSCONF_LINK		= $(SYS_CXX)
+SYSCONF_LFLAGS		= -L/usr/X11R6/lib -L/usr/local/lib
+SYSCONF_LIBS		= -lz
 
 # Link flags for shared objects
-SYSCONF_LFLAGS_SHOBJ	= -Bshareable
+SYSCONF_LFLAGS_SHOBJ	= -shared -fPIC
 
 # Flags for threading
-SYSCONF_CFLAGS_THREAD	= 
-SYSCONF_CXXFLAGS_THREAD	= 
-SYSCONF_LFLAGS_THREAD	= 
+SYSCONF_CFLAGS_THREAD	= -pthread
+SYSCONF_CXXFLAGS_THREAD	= -pthread
+SYSCONF_LFLAGS_THREAD	= -pthread
 # SYSCONF_LIBS_THREAD	= ???
 
 # Meta-object compiler
@@ -55,9 +55,9 @@
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
 #
-SYSCONF_LINK_SHLIB	= ld
+SYSCONF_LINK_SHLIB	= $(SYS_CXX) -shared -fPIC
 SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
+SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
 
 # Linking static libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`--- configs/openbsd-g++-shared-debug.orig Wed Oct 4 05:55:24 2000`
			`+++ configs/openbsd-g++-shared-debug Sat Oct 7 14:09:52 2000`
			`@@ -1,12 +1,12 @@`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`# Compiling`
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`INTERFACE_DECL_PATH = .`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`-SYSCONF_CXX = g++`
			`+SYSCONF_CXX = $(SYS_CXX)`
			`SYSCONF_CC = gcc`

			`# Compiling with support libraries`
			`-SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include`
Don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. Move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. Package the full tutorial/example along. Install qt1 to qt2 conversion tools along. Provide a link to /usr/local/bin/moc2, to ease getting FreeBSD ports. 2000-06-23 10:17:40 -04:00			`+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -I/usr/local/include`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include`
			`-SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include`
Darn samples want X11 includes. 2000-10-10 09:21:19 -04:00			`+SYSCONF_CXXFLAGS_OPENGL = -I/usr/local/include -I/usr/X11R6/include`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`# Compiling YACC output`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses`
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`@@ -18,30 +18,30 @@`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00
			`# Linking with support libraries`
			`# X11`
			`-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib`
Don't try to be smart with examples and tutorial, moving those files around doesn't work, as there are cross-dependencies. Move LOCALBASE/X11BASE setting to post-patch, as this allows having complete, independent Makefiles for examples/tutorial. Package the full tutorial/example along. Install qt1 to qt2 conversion tools along. Provide a link to /usr/local/bin/moc2, to ease getting FreeBSD ports. 2000-06-23 10:17:40 -04:00			`+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -L/usr/local/lib`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LIBS_X11 = -lXext -lX11 -lm`
			`# Qt, Qt+OpenGL`
			`SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)`
			`SYSCONF_LIBS_QT_OPENGL =`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`# OpenGL`
			`-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib`
Darn qt2 is smarter at configuring than it was. Can't lie to it about libraries locations 2000-10-09 21:26:48 -04:00			`+SYSCONF_LFLAGS_OPENGL = -L/usr/local/lib -L/usr/X11R6/lib`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu`
			`# Yacc`
			`SYSCONF_LIBS_YACC =`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00
			`# Linking applications`
			`-SYSCONF_LINK = g++`
			`-SYSCONF_LFLAGS =`
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`-SYSCONF_LIBS =`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`+SYSCONF_LINK = $(SYS_CXX)`
			`+SYSCONF_LFLAGS = -L/usr/X11R6/lib -L/usr/local/lib`
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`+SYSCONF_LIBS = -lz`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00			`# Link flags for shared objects`
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`-SYSCONF_LFLAGS_SHOBJ = -Bshareable`
Follow my own advice: use -fPIC for linking shared libraries. 2000-10-29 12:22:07 -05:00			`+SYSCONF_LFLAGS_SHOBJ = -shared -fPIC`
Update to qt2 2.0. More patches to not build gl by default (dependency on Mesa) and to build all examples. Still need to investigate gnm, and check whether the gl flavor is actually ok. 2000-09-22 11:02:34 -04:00
			`# Flags for threading`
			`-SYSCONF_CFLAGS_THREAD =`
			`-SYSCONF_CXXFLAGS_THREAD =`
			`-SYSCONF_LFLAGS_THREAD =`
			`+SYSCONF_CFLAGS_THREAD = -pthread`
			`+SYSCONF_CXXFLAGS_THREAD = -pthread`
			`+SYSCONF_LFLAGS_THREAD = -pthread`
			`# SYSCONF_LIBS_THREAD = ???`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00
			`# Meta-object compiler`
upgrade to qt2 2.1 2000-10-08 02:02:00 -04:00			`@@ -55,9 +55,9 @@`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`# - Place target in $(DESTDIR) - which has a trailing /`
			`# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)`
			`#`
			`-SYSCONF_LINK_SHLIB = ld`
and shared libraries along with shared objects... 2000-10-29 15:13:55 -05:00			`+SYSCONF_LINK_SHLIB = $(SYS_CXX) -shared -fPIC`
First cut at a qt2 port. Probably needs some polish, but it compiles and runs. 2000-06-22 19:53:43 -04:00			`SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)`
			-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) \| tsort` $(LIBS)
			`+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)`

			`# Linking static libraries`
			`# - Build the $(TARGET) library, eg. lib$(TARGET).a`