haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

bzip2, fix some install paths, remove static library (#7542)

Browse Source
This commit is contained in:
Schrijvers Luc
2022-12-12 19:49:18 +01:00
committed by GitHub
parent 9bef620ab6
commit 666f85318a
2 changed files with 92 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app-arch/bzip2/bzip2-1.0.8.recipe
View File

@@ -77,32 +77,19 @@ BUILD()
INSTALL()
{
make install PREFIX=$prefix
mkdir -p $libDir
#move the static library to the right dir for secondary arch builds
if [ -n "$secondaryArchSuffix" ];then
mv $prefix/lib/libbz2.a $libDir
fi
make install PREFIX=$prefix BINDIR=$binDir \
LIBDIR=$libDir \
INCLUDEDIR=$includeDir \
MANDIR=$manDir/man1
# also install shared lib
ln -sf libbz2.so.$portVersion libbz2.so
cp -a libbz2.so.$portVersion libbz2.so.1.0 libbz2.so $libDir
# move man pages
mkdir -p $manDir
mv $prefix/man/* $manDir
rmdir $prefix/man
# remove static library
rm $libDir/*.a
# move headers
bzip2IncludeDir=$includeDir
mkdir -p $bzip2IncludeDir
mv $prefix/include/* $bzip2IncludeDir
rmdir $prefix/include
# prepare development lib links
prepareInstalledDevelLibs libbz2
prepareInstalledDevelLib libbz2
# devel package
packageEntries devel \

115
app-arch/bzip2/patches/bzip2-1.0.8.patchset
View File

@@ -1,48 +1,103 @@
From d854ab39db1fc88a21f782cf983d7d247dbc4db8 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Sun, 27 May 2018 13:48:37 +0000
Subject: install {bunzip2,bzcat} using symlinks.
Subject: install {bunzip2,bzcat} using symlinks, add install paths.
Also, install {bzcmp,bzegrep,bzfgrep,bzless} using relative symlinks.
diff --git a/Makefile b/Makefile
index 9754ddf..4ff35ed 100644
index f8a1772..e7ee221 100644
--- a/Makefile
+++ b/Makefile
@@ -76,12 +76,10 @@ install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
cp -f bzip2 $(PREFIX)/bin/bzip2
@@ -25,6 +25,10 @@ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
PREFIX=/usr/local
+BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib
+INCLUDEDIR=${PREFIX}/include
+MANDIR=${PREFIX}/man/man1
OBJS= blocksort.o \
@@ -70,43 +74,41 @@ test: bzip2
@cat words3
install: bzip2 bzip2recover
- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
- cp -f bzip2 $(PREFIX)/bin/bzip2
- cp -f bzip2 $(PREFIX)/bin/bunzip2
- cp -f bzip2 $(PREFIX)/bin/bzcat
+ ln -s -f bzip2 $(PREFIX)/bin/bunzip2
+ ln -s -f bzip2 $(PREFIX)/bin/bzcat
cp -f bzip2recover $(PREFIX)/bin/bzip2recover
chmod a+x $(PREFIX)/bin/bzip2
- cp -f bzip2recover $(PREFIX)/bin/bzip2recover
- chmod a+x $(PREFIX)/bin/bzip2
- chmod a+x $(PREFIX)/bin/bunzip2
- chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
cp -f bzip2.1 $(PREFIX)/man/man1
chmod a+r $(PREFIX)/man/man1/bzip2.1
@@ -90,14 +88,14 @@ install: bzip2 bzip2recover
cp -f libbz2.a $(PREFIX)/lib
chmod a+r $(PREFIX)/lib/libbz2.a
cp -f bzgrep $(PREFIX)/bin/bzgrep
- chmod a+x $(PREFIX)/bin/bzip2recover
- cp -f bzip2.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzip2.1
- cp -f bzlib.h $(PREFIX)/include
- chmod a+r $(PREFIX)/include/bzlib.h
- cp -f libbz2.a $(PREFIX)/lib
- chmod a+r $(PREFIX)/lib/libbz2.a
- cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ ln -r -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+ ln -r -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
chmod a+x $(PREFIX)/bin/bzgrep
cp -f bzmore $(PREFIX)/bin/bzmore
- chmod a+x $(PREFIX)/bin/bzgrep
- cp -f bzmore $(PREFIX)/bin/bzmore
- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ ln -r -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- chmod a+x $(PREFIX)/bin/bzmore
- cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ ln -r -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
chmod a+r $(PREFIX)/man/man1/bzgrep.1
- chmod a+x $(PREFIX)/bin/bzdiff
- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzgrep.1
- chmod a+r $(PREFIX)/man/man1/bzmore.1
- chmod a+r $(PREFIX)/man/man1/bzdiff.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
- 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 $(BINDIR) ) ; then mkdir -p $(BINDIR) ; fi
+ if ( test ! -d $(LIBDIR) ) ; then mkdir -p $(LIBDIR) ; fi
+ if ( test ! -d $(MANDIR) ) ; then mkdir -p $(MANDIR) ; fi
+ if ( test ! -d $(MANDIR)/man/man1 ) ; then mkdir -p $(MANDIR)/man/man1 ; fi
+ if ( test ! -d $(INCLUDEDIR) ) ; then mkdir -p $(INCLUDEDIR) ; fi
+ cp -f bzip2 $(BINDIR)/bzip2
+ ln -s -f bzip2 $(BINDIR)/bunzip2
+ ln -s -f bzip2 $(BINDIR)/bzcat
+ cp -f bzip2recover $(BINDIR)/bzip2recover
+ chmod a+x $(BINDIR)/bzip2
+ chmod a+x $(BINDIR)/bzip2recover
+ cp -f bzip2.1 $(MANDIR)
+ chmod a+r $(MANDIR)/bzip2.1
+ cp -f bzlib.h $(INCLUDEDIR)
+ chmod a+r $(INCLUDEDIR)/bzlib.h
+ cp -f libbz2.a $(LIBDIR)
+ chmod a+r $(LIBDIR)/libbz2.a
+ cp -f bzgrep $(BINDIR)/bzgrep
+ ln -r -s -f $(BINDIR)/bzgrep $(PREFIX)/bin/bzegrep
+ ln -r -s -f $(BINDIR)/bzgrep $(PREFIX)/bin/bzfgrep
+ chmod a+x $(BINDIR)/bzgrep
+ cp -f bzmore $(BINDIR)/bzmore
+ ln -r -s -f $(BINDIR)/bzmore $(BINDIR)/bzless
+ chmod a+x $(BINDIR)/bzmore
+ cp -f bzdiff $(BINDIR)/bzdiff
+ ln -r -s -f $(BINDIR)/bzdiff $(BINDIR)/bzcmp
+ chmod a+x $(BINDIR)/bzdiff
+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(MANDIR)
+ chmod a+r $(MANDIR)/bzgrep.1
+ chmod a+r $(MANDIR)/bzmore.1
+ chmod a+r $(MANDIR)/bzdiff.1
+ echo ".so man1/bzgrep.1" > $(MANDIR)/bzegrep.1
+ echo ".so man1/bzgrep.1" > $(MANDIR)/bzfgrep.1
+ echo ".so man1/bzmore.1" > $(MANDIR)/bzless.1
+ echo ".so man1/bzdiff.1" > $(MANDIR)/bzcmp.1
clean:
rm -f *.o libbz2.a bzip2 bzip2recover \
--
2.17.0
2.37.3