diff options
Diffstat (limited to 'x11-toolkits/qt22/files/patch-aa')
| -rw-r--r-- | x11-toolkits/qt22/files/patch-aa | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/x11-toolkits/qt22/files/patch-aa b/x11-toolkits/qt22/files/patch-aa index 02f30cd..fa8d589 100644 --- a/x11-toolkits/qt22/files/patch-aa +++ b/x11-toolkits/qt22/files/patch-aa @@ -1,22 +1,23 @@ ---- configs/freebsd-g++-shared.orig Thu Jul 9 14:24:33 1998 -+++ configs/freebsd-g++-shared Sun Sep 27 11:46:29 1998 +--- configs/freebsd-g++-shared.orig Thu Oct 1 23:12:11 1998 ++++ configs/freebsd-g++-shared Mon Nov 23 18:05:47 1998 @@ -38,8 +38,26 @@ # - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN) # SYSCONF_LINK_SHLIB = ld +-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) +ifeq ($(PORTOBJFORMAT),elf) -+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) -+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -soname \ -+ $(SYSCONF_LINK_TARGET_SHARED) $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ ++SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) ++SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -soname \ ++ $(SYSCONF_LINK_TARGET_SHARED) $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED)\ + `lorder $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ + cd $(DESTDIR); \ + rm -f lib$(TARGET).so; \ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; +else - SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) --SYSCONF_LINK_LIB_SHARED = $(LINK) -Bshareable $(LFLAGS) -o $(TARGETD) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS) -+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable \ ++SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) ++SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ + `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ @@ -28,9 +29,9 @@ # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a -@@ -50,11 +68,11 @@ - SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC); \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) +@@ -51,11 +69,11 @@ + $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) \ + ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) # Compiling application source -SYSCONF_CFLAGS = -O2 -fno-strength-reduce +SYSCONF_CFLAGS = -pipe -O2 -fno-strength-reduce |
