103 lines
3.7 KiB
Text
103 lines
3.7 KiB
Text
$NetBSD: patch-ac,v 1.6 2002/10/25 10:56:05 bouyer Exp $
|
|
|
|
--- configs/solaris-g++-static.in.orig Wed Jun 13 10:56:50 2001
|
|
+++ configs/solaris-g++-static.in Thu Oct 17 18:28:26 2002
|
|
@@ -2,24 +2,25 @@
|
|
INTERFACE_DECL_PATH = .
|
|
SYSCONF_CXX = g++
|
|
SYSCONF_CC = gcc
|
|
+SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++
|
|
DASHCROSS =
|
|
|
|
# Compiling with support libraries
|
|
-SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include
|
|
+SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include
|
|
SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
|
|
-SYSCONF_CXXFLAGS_OPENGL =
|
|
+SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include
|
|
|
|
# Compiling YACC output
|
|
SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
|
|
|
|
# Linking with support libraries
|
|
-SYSCONF_RPATH_X11 = -Wl,-R,/usr/openwin/lib
|
|
-SYSCONF_RPATH_QT = -Wl,-R,$(QTDIR)/lib
|
|
-SYSCONF_RPATH_OPENGL =
|
|
+SYSCONF_RPATH_X11 = -Wl,-R,@X11BASE@/lib
|
|
+SYSCONF_RPATH_QT = -Wl,-R,@QTDIR@/lib
|
|
+SYSCONF_RPATH_OPENGL = -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib
|
|
|
|
# Linking with support libraries
|
|
# X11
|
|
-SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib
|
|
+SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib
|
|
SYSCONF_LIBS_X11 = -lXext -lX11 -lm -lresolv -lsocket -lnsl
|
|
# Qt, Qt+OpenGL
|
|
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
|
@@ -26,13 +27,13 @@
|
|
SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
|
|
SYSCONF_LIBS_QT_OPENGL =
|
|
# OpenGL
|
|
-SYSCONF_LFLAGS_OPENGL =
|
|
+SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib
|
|
SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
|
|
# Yacc
|
|
SYSCONF_LIBS_YACC =
|
|
|
|
# Linking applications
|
|
-SYSCONF_LINK = g++
|
|
+SYSCONF_LINK = $(LIBTOOL) --mode=link g++
|
|
SYSCONF_LFLAGS =
|
|
SYSCONF_LIBS =
|
|
|
|
@@ -51,39 +52,22 @@
|
|
# UI compiler
|
|
SYSCONF_UIC = $(QTDIR)/bin/uic
|
|
|
|
-# Linking shared libraries
|
|
-# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
|
|
+# Linking libtool libraries
|
|
+# - Build the $(TARGET) library, eg. lib$(TARGET).la
|
|
# - Place target in $(DESTDIR) - which has a trailing /
|
|
# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
|
|
#
|
|
-SYSCONF_LINK_SHLIB = g++
|
|
-SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
|
|
-SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -h $(TARGET1) \
|
|
- $(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) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
|
|
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
|
|
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
|
|
- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
|
|
-
|
|
-# Linking static libraries
|
|
-# - Build the $(TARGET) library, eg. lib$(TARGET).a
|
|
-# - Place target in $(DESTDIR) - which has a trailing /
|
|
-#
|
|
-SYSCONF_AR = ar cq
|
|
-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
|
|
-SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
|
|
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
|
|
+SYSCONF_LINK_TARGET = lib$(TARGET).la
|
|
+SYSCONF_LINK_LIB = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \
|
|
+ $(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \
|
|
+ -version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \
|
|
+ $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS)
|
|
# Compiling application source
|
|
-SYSCONF_CXXFLAGS = -O2
|
|
-SYSCONF_CFLAGS = -O2
|
|
-SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
|
|
-SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
|
|
+#SYSCONF_CXXFLAGS = -O2
|
|
+#SYSCONF_CFLAGS = -O2
|
|
# Compiling library source
|
|
-SYSCONF_CXXFLAGS_LIB =
|
|
-SYSCONF_CFLAGS_LIB =
|
|
+#SYSCONF_CXXFLAGS_LIB =
|
|
+#SYSCONF_CFLAGS_LIB =
|
|
# Compiling shared-object source
|
|
SYSCONF_CXXFLAGS_SHOBJ = -fPIC
|
|
SYSCONF_CFLAGS_SHOBJ = -fPIC
|