summaryrefslogtreecommitdiffstats
path: root/archive
diff options
context:
space:
mode:
authorEric Sandall2020-09-01 18:39:00 -0700
committerEric Sandall2020-09-01 18:39:00 -0700
commite2c207f8ea169b1adc5f6146d9bf278bc4adaa78 (patch)
tree5738075dd486b9776031a774c3a69406409a5d48 /archive
parentb32c7109ad396c2d73226ee1e1fb8aefe4e3ff63 (diff)
p7zip: Add SOURCE2 to download patch from http://www.linuxfromscratch.org/blfs/view/svn/general/p7zip.html
Now compiles with modern GCC. Verify and apply downloaded patch Build all3 (7z, 7za, and now 7zr)
Diffstat (limited to 'archive')
-rwxr-xr-xarchive/p7zip/BUILD2
-rwxr-xr-xarchive/p7zip/DETAILS5
-rw-r--r--archive/p7zip/HISTORY6
-rwxr-xr-xarchive/p7zip/PRE_BUILD2
4 files changed, 13 insertions, 2 deletions
diff --git a/archive/p7zip/BUILD b/archive/p7zip/BUILD
index 906680f78c..58f018813a 100755
--- a/archive/p7zip/BUILD
+++ b/archive/p7zip/BUILD
@@ -1 +1 @@
-make all2
+make all3
diff --git a/archive/p7zip/DETAILS b/archive/p7zip/DETAILS
index 3b418b543f..16de8cd097 100755
--- a/archive/p7zip/DETAILS
+++ b/archive/p7zip/DETAILS
@@ -1,9 +1,12 @@
SPELL=p7zip
VERSION=16.02
- SOURCE_HASH=sha512:d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
SOURCE=${SPELL}_${VERSION}_src_all.tar.bz2
+ SOURCE2=${SPELL}-${VERSION}-consolidated_fixes-1.patch
+ SOURCE_HASH=sha512:d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
+ SOURCE2_HASH=sha512:4fd4ddcc4d35071e9ae14097a52b4ce6c3ab07ed08307424ad8025e9ba821405fce476dcd26667a0ec7893eb352eaa41103096969987122e5f9b8959e60d3423
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_$VERSION"
SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/$SPELL/files/$SOURCE
+ SOURCE2_URL[0]=http://www.linuxfromscratch.org/patches/blfs/svn/${SOURCE2}
DOCS=""
WEB_SITE=http://p7zip.sourceforge.net/
ENTERED=20050123
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index a90516fc47..f764acc1c9 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,9 @@
+2020-09-01 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Add SOURCE2 to download patch from http://www.linuxfromscratch.org/blfs/view/svn/general/p7zip.html
+ Now compiles with modern GCC.
+ * PRE_BUILD: Verify and apply downloaded patch
+ * BUILD: Build all3 (7z, 7za, and now 7zr)
+
2016-07-26 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 16.02
diff --git a/archive/p7zip/PRE_BUILD b/archive/p7zip/PRE_BUILD
index 964168fa6c..b6098383c8 100755
--- a/archive/p7zip/PRE_BUILD
+++ b/archive/p7zip/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
+verify_file 2 &&
cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "${SOURCE_CACHE}/${SOURCE2}" &&
sed -i "/DEST_HOME/s/local//" install.sh makefile.common &&
sedit "s:HOME)/man:HOME)/share/man:" makefile &&