openbsd-ports/x11/qt/patches/patch-ab
brad 57d51facfd - cleanup Makefile
- use -Bforacrchive when linking shared lib
- stop patching static build config with shared lib options
1999-12-20 01:15:21 +00:00

54 lines
1.8 KiB
Plaintext

--- configs/openbsd-g++-static.orig Fri Feb 26 12:02:08 1999
+++ configs/openbsd-g++-static Sun Dec 19 16:02:01 1999
@@ -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$(X11BASE)/include
SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_OPENGL = -I$(X11BASE)/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$(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 = $(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)