diff options
| author | bouyer <bouyer@pkgsrc.org> | 2002-10-25 10:56:05 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2002-10-25 10:56:05 +0000 |
| commit | d0f0cc53c3cef74f5d90ed906860fa635cb4114e (patch) | |
| tree | ed149f3af99c161d748ae16d653edf1f53c7571a /x11/qt2-libs/patches | |
| parent | 92b5ac655f30970d414071db5c94600312bd7426 (diff) | |
| download | pkgsrc-d0f0cc53c3cef74f5d90ed906860fa635cb4114e.tar.gz | |
Don't depend on egcs for solaris, the gcc-2.95.3 provided with solaris9
works fine too.
libtoolize the library builds for solaris, and build shared libraries.
Diffstat (limited to 'x11/qt2-libs/patches')
| -rw-r--r-- | x11/qt2-libs/patches/patch-ac | 59 |
1 files changed, 50 insertions, 9 deletions
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac index 406bb05f400..455b92efd38 100644 --- a/x11/qt2-libs/patches/patch-ac +++ b/x11/qt2-libs/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2002/10/25 10:56:05 bouyer Exp $ ---- configs/solaris-g++-static.in.orig Wed Jun 13 04:56:50 2001 -+++ configs/solaris-g++-static.in -@@ -2,31 +2,32 @@ +--- 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 @@ -34,6 +34,7 @@ $NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $ 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 @@ -42,16 +43,56 @@ $NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $ SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = -@@ -77,13 +78,13 @@ - SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) + + # 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 - SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) - SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) # Compiling library source -SYSCONF_CXXFLAGS_LIB = -SYSCONF_CFLAGS_LIB = |