Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6758d80914e87421ce5d2cf5bf51b339b5d34851)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6758d80914e87421ce5d2cf5bf51b339b5d34851)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6758d80914e87421ce5d2cf5bf51b339b5d34851)
  • Date: Thu, 29 Jul 2021 04:04:22 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

archive/bzip2/DETAILS | 1
archive/bzip2/HISTORY | 5 +
archive/bzip2/INSTALL | 16 +--
archive/bzip2/PRE_BUILD | 4
archive/bzip2/patches/bzip2-pkg-config.patch | 120
+++++++++++++++++++++++++++
5 files changed, 135 insertions(+), 11 deletions(-)

New commits:
commit 6758d80914e87421ce5d2cf5bf51b339b5d34851
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

archive/bzip2: added patch for .pc files and symlinks creation

diff --git a/archive/bzip2/DETAILS b/archive/bzip2/DETAILS
index ce2ba3c..eb3e3da 100755
--- a/archive/bzip2/DETAILS
+++ b/archive/bzip2/DETAILS
@@ -1,6 +1,7 @@
SPELL=bzip2
VERSION=1.0.8

SOURCE_HASH=sha512:083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3:UPSTREAM_HASH
+ PATCHLEVEL=1
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive/bzip2/HISTORY b/archive/bzip2/HISTORY
index c048501..3b874db 100644
--- a/archive/bzip2/HISTORY
+++ b/archive/bzip2/HISTORY
@@ -1,3 +1,8 @@
+2021-07-28 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * INSTALL, PRE_BUILD, patches/bzip2-pkg-config.patch: added patch for
.pc files,
+ symlinks are handled by makefiles now
+
2019-07-14 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.0.8

diff --git a/archive/bzip2/INSTALL b/archive/bzip2/INSTALL
index 1612b03..6426a92 100755
--- a/archive/bzip2/INSTALL
+++ b/archive/bzip2/INSTALL
@@ -1,13 +1,7 @@
-
if [[ "$BZIP2_ROOT" == "y" ]]; then
- make "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT" install
+ make "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT" install &&
+ make -f Makefile-libbz2_so "PREFIX=$INSTALL_ROOT/usr"
"EPREFIX=$INSTALL_ROOT" install
else
- make "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT/usr" install
-fi &&
-# make -f Makefile-libbz2_so &&
-rm -vf ${INSTALL_ROOT}/usr/lib/libbz2.so* &&
-cp libbz2.so.${VERSION} ${INSTALL_ROOT}/usr/lib &&
-cd ${INSTALL_ROOT}/usr/lib &&
-ln -sf libbz2.so.${VERSION} libbz2.so &&
-ln -sf libbz2.so.${VERSION} libbz2.so.1 &&
-ln -sf libbz2.so.${VERSION} libbz2.so.1.0
+ make "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT/usr" install &&
+ make -f Makefile-libbz2_so "PREFIX=$INSTALL_ROOT/usr"
"EPREFIX=$INSTALL_ROOT/usr" install
+fi
diff --git a/archive/bzip2/PRE_BUILD b/archive/bzip2/PRE_BUILD
new file mode 100755
index 0000000..06b75fe
--- /dev/null
+++ b/archive/bzip2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/archive/bzip2/patches/bzip2-pkg-config.patch
b/archive/bzip2/patches/bzip2-pkg-config.patch
new file mode 100644
index 0000000..bdeee74
--- /dev/null
+++ b/archive/bzip2/patches/bzip2-pkg-config.patch
@@ -0,0 +1,120 @@
+diff --git a/Makefile b/Makefile
+index 11bc446..1b8f964 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,6 +12,8 @@
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+
++VERSION=1.0.8
++
+ SHELL=/bin/sh
+
+ # To assist in cross-compiling
+@@ -107,6 +109,9 @@
+ echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+ echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+ echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
++ if ( test ! -d $(PREFIX)/lib/pkgconfig ) ; then mkdir -p
$(PREFIX)/lib/pkgconfig ; fi
++ sed -e "s/@@VERSION@@/$(VERSION)/g;s#@@PREFIX@@#$(PREFIX)#g"
bzip2.pc.in > $(PREFIX)/lib/pkgconfig/bzip2.pc
++ sed -e "s/@@VERSION@@/$(VERSION)/g;s#@@PREFIX@@#$(PREFIX)#g"
libbz2.pc.in > $(PREFIX)/lib/pkgconfig/libbz2.pc
+
+ clean:
+ rm -f *.o libbz2.a bzip2 bzip2recover \
+@@ -137,7 +142,7 @@
+ distclean: clean
+ rm -f manual.ps manual.html manual.pdf
+
+-DISTNAME=bzip2-1.0.8
++DISTNAME=bzip2-$(VERSION)
+ dist: check manual
+ rm -f $(DISTNAME)
+ ln -s -f . $(DISTNAME)
+diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
+index 1f0739b..0c94517 100644
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -20,6 +20,9 @@
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+
++MAJOR_VERSION=1
++MAJOR_MINOR_VERSION=$(MAJOR_VERSION).0
++VERSION=$(MAJOR_MINOR_VERSION).8
+
+ SHELL=/bin/sh
+ CC=gcc
+@@ -34,14 +37,29 @@
+ decompress.o \
+ bzlib.o
+
+-all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
+- rm -f libbz2.so.1.0
+- ln -s libbz2.so.1.0.8 libbz2.so.1.0
++all: $(OBJS)
++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.$(MAJOR_MINOR_VERSION) -o
libbz2.so.$(VERSION) $(OBJS)
++ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.$(VERSION)
++ rm -f libbz2.so.$(MAJOR_MINOR_VERSION)
++ ln -s libbz2.so.$(VERSION) libbz2.so.$(MAJOR_MINOR_VERSION)
++ rm -f libbz2.so.$(MAJOR_VERSION)
++ ln -s libbz2.so.$(VERSION) libbz2.so.$(MAJOR_VERSION)
++ rm -f libbz2.so
++ ln -s libbz2.so.$(VERSION) libbz2.so
++
++install:
++ if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
++ cp -f libbz2.so.$(VERSION) $(PREFIX)/lib
++ chmod a+r
$(PREFIX)/lib/libbz2.so.$(VERSION)
++ cp -f libbz2.so.$(MAJOR_MINOR_VERSION) $(PREFIX)/lib
++ cp -f libbz2.so.$(MAJOR_VERSION) $(PREFIX)/lib
++ cp -f libbz2.so $(PREFIX)/lib
++ if ( test ! -d $(PREFIX)/lib/pkgconfig ) ; then mkdir -p
$(PREFIX)/lib/pkgconfig ; fi
++ sed -e "s/@@VERSION@@/$(VERSION)/g;s#@@PREFIX@@#$(PREFIX)#g"
bzip2.pc.in > $(PREFIX)/lib/pkgconfig/bzip2.pc
++ sed -e "s/@@VERSION@@/$(VERSION)/g;s#@@PREFIX@@#$(PREFIX)#g"
libbz2.pc.in > $(PREFIX)/lib/pkgconfig/libbz2.pc
+
+ clean:
+- rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
++ rm -f $(OBJS) bzip2.o libbz2.so.$(VERSION)
libbz2.so.$(MAJOR_MINOR_VERSION) libbz2.so.$(MAJOR_VERSION) libbz.so
bzip2-shared
+
+ blocksort.o: blocksort.c
+ $(CC) $(CFLAGS) -c blocksort.c
+diff --git a/bzip2.pc.in b/bzip2.pc.in
+new file mode 100644
+index 0000000..74a527c
+--- /dev/null
++++ b/bzip2.pc.in
+@@ -0,0 +1,13 @@
++prefix=@@PREFIX@@
++exec_prefix=\${prefix}/bin
++libdir=\${prefix}/lib
++sharedlibdir=\${prefix}/lib
++includedir=\${prefix}/include
++
++Name: bzip2
++Description: BZip2 compression library
++Version: @@VERSION@@
++
++Requires:
++Libs: -L\${prefix}/lib -lbz2
++Cflags: -I\${prefix}/include
+diff --git a/libbz2.pc.in b/libbz2.pc.in
+new file mode 100644
+index 0000000..ed08e7f
+--- /dev/null
++++ b/libbz2.pc.in
+@@ -0,0 +1,13 @@
++prefix=@@PREFIX@@
++exec_prefix=\${prefix}/bin
++libdir=\${prefix}/lib
++sharedlibdir=\${prefix}/lib
++includedir=\${prefix}/include
++
++Name: libbz2
++Description: BZip2 compression library
++Version: @@VERSION@@
++
++Requires:
++Libs: -L\${prefix}/lib -lbz2
++Cflags: -I\${prefix}/include


  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6758d80914e87421ce5d2cf5bf51b339b5d34851), Pavel Vinogradov, 07/29/2021

Archive powered by MHonArc 2.6.24.

Top of Page