Date: Sat, 26 Sep 1998 12:28:33 +0200 (CEST) From: Joachim Kuebart <joki@kuebart.stuttgart.netsurf.de> To: freebsd-current@FreeBSD.ORG (FreeBSD Current) Subject: Re: Mesa port broken? Message-ID: <199809261028.MAA00387@yacht.domestic.de>
next in thread | raw e-mail | index | archive | help
Hi, a while ago I sent these qt-elf and kde-elf patches to this list, but they were unwelcome. Maybe they can be of help now: It's been some time since I used these. bsd.port.mk has changed a lot so maybe they won't work anymore... Index: Makefile =================================================================== RCS file: /usr/CVS-Repository/ports/x11/kdebase/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 1998/08/12 06:29:35 1.17 +++ Makefile 1998/09/03 18:19:36 @@ -25,6 +25,7 @@ USE_QT= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ + "--with-qt-libraries=$(X11BASE)/lib" \ "--with-extra-includes=$(PREFIX)/include/giflib" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ Index: Makefile =================================================================== RCS file: /usr/CVS-Repository/ports/x11/kdelibs/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- Makefile 1998/08/12 06:29:36 1.16 +++ Makefile 1998/09/03 19:24:47 @@ -20,7 +20,8 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ "--x-inc=$(X11BASE)/include" \ - "--x-lib=$(X11BASE)/lib" + "--x-lib=$(X11BASE)/lib" \ + "--with-qt-libraries=$(X11BASE)/lib" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" .include <bsd.port.mk> Index: Makefile =================================================================== RCS file: /usr/CVS-Repository/ports/graphics/kdegraphics/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 1998/08/12 06:29:29 1.11 +++ Makefile 1998/09/03 22:50:11 @@ -25,6 +25,7 @@ USE_QT= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ + "--with-qt-libraries=$(X11BASE)/lib" \ "--with-extra-includes=$(PREFIX)/include/giflib" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ Index: Makefile =================================================================== RCS file: /usr/CVS-Repository/ports/misc/kdeutils/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 1998/08/12 06:29:31 1.17 +++ Makefile 1998/09/03 22:33:23 @@ -25,6 +25,7 @@ USE_QT= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ + "--with-qt-libraries=$(X11BASE)/lib" \ "--with-extra-includes=$(PREFIX)/include/giflib" CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ Index: patches/patch-aa =================================================================== RCS file: /usr/CVS-Repository/ports/x11-toolkits/qt140/patches/patch-aa,v retrieving revision 1.1 diff -u -r1.1 patch-aa --- patch-aa 1998/07/20 16:51:18 1.1 +++ patch-aa 1998/09/03 20:39:10 @@ -1,13 +1,31 @@ --- configs/freebsd-g++-shared.orig Thu Jul 9 21:24:33 1998 -+++ configs/freebsd-g++-shared Sun Jul 19 13:31:29 1998 -@@ -39,7 +39,14 @@ ++++ configs/freebsd-g++-shared Thu Sep 3 22:37:06 1998 +@@ -23,7 +23,7 @@ + + # Linking applications + SYSCONF_LINK = g++ +-SYSCONF_LFLAGS = ++SYSCONF_LFLAGS = -rpath /usr/X11R6/lib + SYSCONF_LIBS = + + # Link flags shared objects +@@ -37,9 +37,23 @@ + # - Place target in $(DESTDIR) - which has a trailing / + # - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN) # ++SYSCONF_ELF = $(shell printf "\#ifdef __ELF__\nelf\n\#endif" | \ ++ cc -E -P -) ++ifeq ($(strip $(SYSCONF_ELF)), elf) ++SYSCONF_CXXRT0 = ++else ++SYSCONF_CXXRT0 = /usr/lib/c++rt0.o ++endif SYSCONF_LINK_SHLIB = ld 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 \ + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ -+ `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \ ++ `lorder $(SYSCONF_CXXRT0) $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \ + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ + cd $(DESTDIR); \ + rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \ @@ -16,7 +34,7 @@ # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a -@@ -50,11 +57,11 @@ +@@ -50,11 +64,11 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC); \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source cu Jo --------------------------------------------------------------------- FreeBSD: The Power to Serve <http://www.freebsd.org>; Joachim Kuebart Tel: +49 711 653706 I like to think. Germany To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199809261028.MAA00387>