openbsd-ports/x11/qt/patches/patch-configs_openbsd-g++-static
brad b645d13993 - 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.
- use better filenames for patches and include patches to setup the debug
  Qt config files.
2000-06-30 07:01:33 +00:00

54 lines
1.8 KiB
Plaintext

--- configs/openbsd-g++-static.orig Sat Jun 24 14:42:12 2000
+++ configs/openbsd-g++-static Sat Jun 24 14:49:55 2000
@@ -1,30 +1,30 @@
# Compiling
-SYSCONF_CXX = g++
+SYSCONF_CXX = $(SYS_CXX)
# 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
# Compiline YACC output
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
# 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 = -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/usr/local/lib
SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm
# Yacc
SYSCONF_LIBS_YACC =
# Linking applications
-SYSCONF_LINK = g++
+SYSCONF_LINK = $(SYS_CXX)
SYSCONF_LFLAGS =
SYSCONF_LIBS =
@@ -53,10 +53,10 @@
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
# Compiling application source
-SYSCONF_CXXFLAGS = -O2 -fno-strength-reduce
+SYSCONF_CXXFLAGS = $(SYS_CXXFLAGS) -fno-strength-reduce
# Compiling library source
-SYSCONF_CXXFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_LIB = $(SYS_CXXFLAGS) -fno-strength-reduce -fPIC
# Compiling shared-object source
-SYSCONF_CXXFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_SHOBJ = $(SYS_CXXFLAGS) -fno-strength-reduce -fPIC
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)