cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better patches, uses $(LOCALBASE) to try and link in Mesa if someone trys to compile qgl separately

Browse Source
This commit is contained in:
brad 2000-03-08 08:52:36 +00:00
parent 6e64abcffe
commit 604f1e7b82
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
x11/qt/patches/patch-aa
View File

@ -1,5 +1,5 @@
--- configs/openbsd-g++-shared.orig Fri Feb 26 17:02:08 1999
+++ configs/openbsd-g++-shared Tue Mar 7 18:02:02 2000
--- configs/openbsd-g++-shared.orig Fri Feb 26 12:02:08 1999
+++ configs/openbsd-g++-shared Tue Mar 7 21:03:15 2000
@@ -1,35 +1,35 @@
# Compiling
-SYSCONF_CXX = g++
@ -10,7 +10,7 @@
+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
+SYSCONF_CXXFLAGS_OPENGL = -I$(LOCALBASE)/include
# Compiline YACC output
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
@ -26,7 +26,7 @@
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
+SYSCONF_LFLAGS_OPENGL = -L$(LOCALBASE)/lib
SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
# Yacc
SYSCONF_LIBS_YACC =
@ -43,19 +43,15 @@
# Meta-object compiler
SYSCONF_MOC = $(QTDIR)/bin/moc
@@ -40,9 +40,9 @@
# - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
@@ -41,7 +41,7 @@
#
SYSCONF_LINK_SHLIB = ld
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-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_TARGET_SHARED = lib$(TARGET).so.1.45
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable -Bforcearchive $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
+
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable -Bforcearchive $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
# - Place target in $(DESTDIR) - which has a trailing /
@@ -53,11 +53,11 @@
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)

8
x11/qt/patches/patch-ab
View File

@ -1,5 +1,5 @@
--- configs/openbsd-g++-static.orig Fri Feb 26 17:02:08 1999
+++ configs/openbsd-g++-static Tue Mar 7 18:05:35 2000
--- configs/openbsd-g++-static.orig Fri Feb 26 12:02:08 1999
+++ configs/openbsd-g++-static Tue Mar 7 21:04:50 2000
@@ -1,30 +1,30 @@
# Compiling
-SYSCONF_CXX = g++
@ -10,7 +10,7 @@
+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
+SYSCONF_CXXFLAGS_OPENGL = -I$(LOCALBASE)/include
# Compiline YACC output
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
@ -26,7 +26,7 @@
SYSCONF_LIBS_QT_OPENGL = -lqgl
# OpenGL
-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib
+SYSCONF_LFLAGS_OPENGL = -L$(LOCALBASE)/lib
SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
# Yacc
SYSCONF_LIBS_YACC =