diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2006-07-13 00:33:05 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2006-07-13 00:33:05 +0000 |
| commit | 31e37052725dd5a4a98766c75c1809a2d9055427 (patch) | |
| tree | 66f73a0f2057c8d3c4e04eb2006c6c09f134c2f0 /devel/pwlib | |
| parent | ccf6c73d11ce8da8b0af8f28e5ea77fecefb96c4 (diff) | |
| download | ports-31e37052725dd5a4a98766c75c1809a2d9055427.tar.gz ports-31e37052725dd5a4a98766c75c1809a2d9055427.zip | |
Shared library name in FreeBSD should be libfoo.so.X, not libfoo.so.X.Y.Z. No
user-visible changes, so that keep PORTREVISION intact.
Notes
Notes:
svn path=/head/; revision=167644
Diffstat (limited to 'devel/pwlib')
| -rw-r--r-- | devel/pwlib/files/patch-Makefile.in | 26 | ||||
| -rw-r--r-- | devel/pwlib/files/patch-make::lib.mak | 51 |
2 files changed, 77 insertions, 0 deletions
diff --git a/devel/pwlib/files/patch-Makefile.in b/devel/pwlib/files/patch-Makefile.in new file mode 100644 index 000000000000..b267f3ef20c9 --- /dev/null +++ b/devel/pwlib/files/patch-Makefile.in @@ -0,0 +1,26 @@ + +$FreeBSD$ + +--- Makefile.in ++++ Makefile.in +@@ -257,18 +254,10 @@ + $(DESTDIR)$(PREFIX)/share/pwlib/make ; \ + do mkdir -p $$dir ; chmod 755 $$dir ; \ + done ) +- $(INSTALL) -m 444 lib/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR) +- (cd $(DESTDIR)$(LIBDIR) ; \ +- rm -f $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ ; \ +- ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@ \ +- ) +- (cd $(DESTDIR)$(LIBDIR) ; \ +- rm -f $(PTLIB_FILE).@MAJOR_VERSION@ ; \ +- ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(PTLIB_FILE).@MAJOR_VERSION@ \ +- ) ++ $(INSTALL) -m 444 lib/$(PTLIB_FILE).@MAJOR_VERSION@ $(DESTDIR)$(LIBDIR) + (cd $(DESTDIR)$(LIBDIR) ; \ + rm -f $(PTLIB_FILE) ; \ +- ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(PTLIB_FILE) \ ++ ln -sf $(PTLIB_FILE).@MAJOR_VERSION@ $(PTLIB_FILE) \ + ) + (cd $(DESTDIR)$(LIBDIR); \ + rm -f libpt.@SHAREDLIBEXT@ ; \ diff --git a/devel/pwlib/files/patch-make::lib.mak b/devel/pwlib/files/patch-make::lib.mak new file mode 100644 index 000000000000..c5098242f269 --- /dev/null +++ b/devel/pwlib/files/patch-make::lib.mak @@ -0,0 +1,51 @@ + +$FreeBSD$ + +--- make/lib.mak ++++ make/lib.mak +@@ -130,12 +127,18 @@ + # + + ifneq ($(OSTYPE),Darwin) +- LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION) +- LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION) +- ifeq ($(BUILD_TYPE),.) +- LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER) ++ ifeq ($(OSTYPE),FreeBSD) ++ LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION) ++ LIBNAME_MIN = $(LIBNAME_MAJ) ++ LIBNAME_PAT = $(LIBNAME_MAJ) + else +- LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER) ++ LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION) ++ LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION) ++ ifeq ($(BUILD_TYPE),.) ++ LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER) ++ else ++ LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER) ++ endif + endif + else + LIBNAME_MAJ = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME)) +@@ -212,8 +215,10 @@ + + $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT) + cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME) ++ifneq ($(OSTYPE),FreeBSD) + cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ) + cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN) ++endif + + $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE) + @echo EXTLIBS = $(EXTLIBS) +@@ -224,8 +229,10 @@ + install: $(LIBDIR)/$(LIBNAME_PAT) + $(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT) + ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME) ++ifneq ($(OSTYPE),FreeBSD) + ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ) + ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN) ++endif + + endif # P_SHAREDLIB + |