cd1ee1d986
they are installed and should work without the pkgsrc framework to define e.g. LIBTOOL. Bump the revision for this. Fix the inclusion in Makefiles by crudely faking the installation directory layout. Remove some explicit casts which break with GCC 3.4 and OpenSSL 0.9.8, this might need to be conditionalized. Add DraogonFly support and somewhat cleanup the FreeBSD sound includes.
43 lines
1.8 KiB
Text
43 lines
1.8 KiB
Text
$NetBSD: patch-ab,v 1.8 2006/01/08 04:57:55 joerg Exp $
|
|
|
|
--- make/lib.mak.orig 2004-06-17 08:33:07.000000000 +0200
|
|
+++ make/lib.mak 2004-10-09 14:49:04.000000000 +0200
|
|
@@ -175,7 +175,7 @@ ifeq ($(P_SHAREDLIB),1)
|
|
endif
|
|
|
|
ifneq ($(OSTYPE), QNX)
|
|
- ifneq (,$(findstring $(OSTYPE),FreeBSD OpenBSDs))
|
|
+ ifneq (,$(findstring $(OSTYPE),FreeBSD OpenBSD DragonFly))
|
|
ifdef P_PTHREADS
|
|
EXTLIBS += -pthread
|
|
endif
|
|
@@ -200,22 +200,18 @@ ifeq ($(P_SHAREDLIB),1)
|
|
LD = $(CPLUS)
|
|
endif
|
|
|
|
- $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
|
|
- cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
|
|
- cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
|
|
- cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
|
|
+ ENDLDLIBS += -L$(PREFIX)/lib @PTHREAD_FLAGS@ @LIBOSSAUDIO@
|
|
|
|
- $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
|
|
+ $(LIBDIR)/$(LIB_FILENAME): $(OBJS)
|
|
@echo EXTLIBS = $(EXTLIBS)
|
|
@echo SYSLIBS = $(SYSLIBS)
|
|
@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
|
|
- $(LD) $(LDSOOPTS) -o $(LIBDIR)/$(LIBNAME_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(ENDLDLIBS)
|
|
+ @LIBTOOL@ --tag=CXX --mode=link $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
|
|
+ $(OBJS:.o=.lo) $(EXTLIBS) $(ENDLDLIBS) -rpath $(INSTALLLIB_DIR) \
|
|
+ -release $(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER)
|
|
|
|
- install: $(LIBDIR)/$(LIBNAME_PAT)
|
|
- $(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
|
|
- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
|
|
- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
|
|
- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
|
|
+ install: $(LIBDIR)/$(LIB_FILENAME)
|
|
+ @LIBTOOL@ --mode=install @BSD_INSTALL_LIB@ $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
|
|
|
|
endif # P_SHAREDLIB
|
|
|