diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1999-01-07 10:58:33 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1999-01-07 10:58:33 +0000 |
| commit | 6a187e06e92d35be66e4ea1e632addbfba32b295 (patch) | |
| tree | f5c5af30260d8e4c952cbfba67260f4c28c10c69 /x11-toolkits/qt30/files | |
| parent | 3a42f958e5b2625f83bc22e22fe0154c2c8c7aae (diff) | |
Upgrade qt141 to qt142 after repository copy. qt141 will be deleted after
a short test period to make sure qt142 is an adequate replacement.
Note #1: I changed it to install libqt.so.2.0. qt141 or newer are
required for some software (most notably kde). We missed the
chance to change the shlib number in qt141 so I'm doing it now.
Note #2: After talking with Peter Wemm, I decided not to add extra
-rpath directives. The fix for kdesupport and other build
problems are forthcoming in ld.
Notes
Notes:
svn path=/head/; revision=15910
Diffstat (limited to 'x11-toolkits/qt30/files')
| -rw-r--r-- | x11-toolkits/qt30/files/patch-aa | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa index fa8d5891d925..aabb438685c3 100644 --- a/x11-toolkits/qt30/files/patch-aa +++ b/x11-toolkits/qt30/files/patch-aa @@ -1,40 +1,38 @@ ---- 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 @@ +--- ./configs/freebsd-g++-shared.org Tue Nov 17 06:19:01 1998 ++++ ./configs/freebsd-g++-shared Wed Jan 6 23:49:34 1999 +@@ -40,15 +44,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) + SYSCONF_LINK_SHLIB = g++ +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)\ -+ `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; ++SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) ++SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ ++ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ ++ -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \ ++ $(OBJECTS) $(OBJMOC) $(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 = $(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); \ -+ cd $(DESTDIR); \ -+ rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \ -+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ -+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ) + SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) + SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ + $(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); \ +- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ +- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ) ++ rm -f lib$(TARGET).so; \ ++ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so +endif # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a -@@ -51,11 +69,11 @@ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) \ - ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) +@@ -61,9 +76,9 @@ # Compiling application source --SYSCONF_CFLAGS = -O2 -fno-strength-reduce -+SYSCONF_CFLAGS = -pipe -O2 -fno-strength-reduce + SYSCONF_CFLAGS = -pipe -O2 -fno-strength-reduce # Compiling library source -SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC +SYSCONF_CFLAGS_LIB = -pipe -O2 -fno-strength-reduce -fPIC |