diff options
Diffstat (limited to 'archivers/lz4/patches/patch-lib_Makefile')
| -rw-r--r-- | archivers/lz4/patches/patch-lib_Makefile | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile index 1c6527ab3ff..3d38feea674 100644 --- a/archivers/lz4/patches/patch-lib_Makefile +++ b/archivers/lz4/patches/patch-lib_Makefile @@ -1,66 +1,67 @@ -$NetBSD: patch-lib_Makefile,v 1.2 2015/06/09 12:04:19 fhajny Exp $ +$NetBSD: patch-lib_Makefile,v 1.3 2016/12/07 21:34:58 fhajny Exp $ -Make portable, use pkgsrc install scripts. ---- lib/Makefile.orig 2015-05-26 01:13:50.000000000 +0000 +Make portable. Unlock install target. Use pkgsrc install scripts. + +--- lib/Makefile.orig 2016-11-22 20:34:17.000000000 +0000 +++ lib/Makefile -@@ -32,9 +32,9 @@ +@@ -31,9 +31,9 @@ + # ################################################################ # Version numbers - VERSION ?= 129 --LIBVER_MAJOR=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` --LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` --LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h` -+LIBVER_MAJOR=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h` -+LIBVER_MINOR=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h` -+LIBVER_PATCH=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h` - LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) - - DESTDIR?= -@@ -79,28 +79,24 @@ clean: +-LIBVER_MAJOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` +-LIBVER_MINOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` +-LIBVER_PATCH_SCRIPT:=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` ++LIBVER_MAJOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h` ++LIBVER_MINOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h` ++LIBVER_PATCH_SCRIPT:=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h` + LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) + LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) + LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) +@@ -107,31 +107,27 @@ clean: @echo Cleaning library completed -#------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) -- +-#make install is validated only for Linux, OSX, kFreeBSD, Hurd and +-#FreeBSD targets +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD)) + liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig - @sed -e 's|@PREFIX@|$(PREFIX)|' \ -- -e 's|@LIBDIR@|$(LIBDIR)|' \ -- -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ -- -e 's|@VERSION@|$(VERSION)|' \ +- -e 's|@LIBDIR@|$(LIBDIR)|' \ +- -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \ +- -e 's|@VERSION@|$(LIBVER)|' \ + @sed -e 's|@PREFIX@|$(PREFIX)|g' \ -+ -e 's|@LIBDIR@|$(LIBDIR)|g' \ -+ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|g' \ -+ -e 's|@VERSION@|$(VERSION)|g' \ - $< >$@ ++ -e 's|@LIBDIR@|$(LIBDIR)|g' \ ++ -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|g' \ ++ -e 's|@VERSION@|$(LIBVER)|g' \ + $< >$@ - install: liblz4 liblz4.pc + install: lib liblz4.pc - @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ -- @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER) -- @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) -- @cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR) -- @cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ +- @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) ++ $(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ ++ $(BSD_INSTALL_LIB) -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) + @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) + @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) +- @install -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ ++ $(BSD_INSTALL_DATA) -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ + ifeq ($(BUILD_STATIC),yes) - @install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a ++ $(BSD_INSTALL_DATA) -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a + endif - @install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h - @install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h - @install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h -+ $(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ -+ $(BSD_INSTALL_LIB) -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER) -+ @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) -+ @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) -+ $(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ -+ $(BSD_INSTALL_LIB) -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a + $(BSD_INSTALL_DATA) -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h + $(BSD_INSTALL_DATA) -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h + $(BSD_INSTALL_DATA) -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h - @echo lz4 static and shared library installed + @echo lz4 static and shared libraries installed uninstall: -@@ -113,5 +109,3 @@ uninstall: - @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4hc.h - @[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h +@@ -145,4 +141,3 @@ uninstall: + @$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h @echo lz4 libraries successfully uninstalled -- + -endif |