cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- cleanup Makefile

Browse Source 
- use -Bforacrchive when linking shared lib
- stop patching static build config with shared lib options
This commit is contained in:
brad 1999-12-20 01:15:21 +00:00
parent 8d079cb5f9
commit 57d51facfd
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/qt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 1999/11/30 02:32:22 brad Exp $
# $OpenBSD: Makefile,v 1.25 1999/12/20 01:15:21 brad Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
DISTNAME= qt-1.44
@ -14,7 +14,7 @@ LIB_DEPENDS= MesaGL.3.0:${PORTSDIR}/graphics/Mesa \
USE_GMAKE= yes
USE_X11= yes
MAKE_ENV+= QTDIR=${WRKSRC} SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}"
MAKE_ENV+= QTDIR="${WRKSRC}" SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}"
EXAMPLES=aclock application biff connect cursor dclock desktop dirview \
dragdrop drawdemo forever hello layout life menu movies pref \
@ -44,15 +44,13 @@ do-install:
@echo -n "Installing tutorials:"
.for n in 1 2 3 4 5 6 7 8 9 10 11 12 13 14
@echo -n " ${n}"
@${INSTALL_PROGRAM} ${WRKSRC}/tutorial/t${n}/t${n} \
${PREFIX}/lib/qt/tutorial
@${INSTALL_PROGRAM} ${WRKSRC}/tutorial/t${n}/t${n} ${PREFIX}/lib/qt/tutorial
.endfor
@echo "."
@echo -n "Installing examples:"
.for f in ${EXAMPLES}
@echo -n " ${f}"
@${INSTALL_PROGRAM} ${WRKSRC}/examples/${f}/${f} \
${PREFIX}/lib/qt/examples
@${INSTALL_PROGRAM} ${WRKSRC}/examples/${f}/${f} ${PREFIX}/lib/qt/examples
.endfor
@echo "."
${INSTALL_DATA} ${WRKSRC}/examples/README ${PREFIX}/lib/qt/examples
@ -60,7 +58,7 @@ do-install:
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS)
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
USE_TARGET= openbsd-g++-static
.else
USE_TARGET= openbsd-g++-shared

12
x11/qt/patches/patch-aa
View File

@ -1,6 +1,6 @@
--- configs/openbsd-g++-shared.orig Fri Feb 26 12:02:08 1999
+++ configs/openbsd-g++-shared Mon Jun 7 09:27:57 1999
@@ -1,30 +1,30 @@
+++ configs/openbsd-g++-shared Sun Dec 19 15:58:51 1999
@@ -1,35 +1,35 @@
# Compiling
-SYSCONF_CXX = g++
+SYSCONF_CXX = $(SYS_CXX)
@ -37,12 +37,18 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
# Link flags shared objects
-SYSCONF_LFLAGS_SHOBJ = -Bshareable
+SYSCONF_LFLAGS_SHOBJ = -Bshareable -Bforcearchive
# Meta-object compiler
SYSCONF_MOC = $(QTDIR)/bin/moc
@@ -41,7 +41,7 @@
#
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_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable -Bforcearchive $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a

11
x11/qt/patches/patch-ab
View File

@ -1,5 +1,5 @@
--- configs/openbsd-g++-static.orig Fri Feb 26 12:02:08 1999
+++ configs/openbsd-g++-static Mon Jun 7 09:28:27 1999
+++ configs/openbsd-g++-static Sun Dec 19 16:02:01 1999
@@ -1,30 +1,30 @@
# Compiling
-SYSCONF_CXX = g++
@ -37,15 +37,6 @@
SYSCONF_LFLAGS =
SYSCONF_LIBS =
@@ -41,7 +41,7 @@
#
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_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) $(OBJECTS) $(OBJMOC) $(LIBS)
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
@@ -53,10 +53,10 @@
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) ; \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)