mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-05 22:43:24 +00:00
763de026f3
I can address some of its issues (should see it marked un-broken in about 3 hours, if they're trivial enough). It took too long to get this update out the door... :-( This is a rather stable version of KDE2. Release is hoped for sometime next month, so I'm going to try to reroll snapshots this weekend. Also decide policy by removing the interactive requirement in qt22's configure script. I don't know why they bothered adding it there.. Bugged by: *many* bug-reports, requests, etc.
42 lines
1.6 KiB
Plaintext
42 lines
1.6 KiB
Plaintext
--- configs/freebsd-g++-shared Tue Aug 22 03:11:09 2000
|
|
+++ configs/freebsd-g++-shared.new Sat Aug 26 09:50:52 2000
|
|
@@ -21,7 +21,7 @@
|
|
SYSCONF_LIBS_X11 = -lXext -lX11 -lm
|
|
# Qt, Qt+OpenGL
|
|
SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
|
|
-SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
|
|
+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX)
|
|
SYSCONF_LIBS_QT_OPENGL =
|
|
# OpenGL
|
|
SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
|
|
@@ -44,7 +44,7 @@
|
|
SYSCONF_LIBS_THREAD =
|
|
|
|
# Meta-object compiler
|
|
-SYSCONF_MOC = $(QTDIR)/bin/moc
|
|
+SYSCONF_MOC = $(QTDIR)/bin/moc2
|
|
|
|
# UI compiler
|
|
SYSCONF_UIC = $(QTDIR)/bin/uic
|
|
@@ -55,16 +55,15 @@
|
|
# - 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_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 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)
|
|
+ rm -f lib$(TARGET).so; \
|
|
+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
|
|
|
|
# Linking static libraries
|
|
# - Build the $(TARGET) library, eg. lib$(TARGET).a
|