[Lunar-commits] <moonbase> make & dev86: patch, bump and tidyup
Paul Bredbury
brebs at lunar-linux.org
Wed Jan 12 16:18:17 CET 2011
commit 7d719adc7dc7f420ffc75adec5ca88d7d80c3b88
Author: Paul Bredbury <brebs at lunar-linux.org>
Date: Wed Jan 12 22:18:17 2011 +0700
make & dev86: patch, bump and tidyup
So make can compile dev86 (needed for VirtualBox 4).
dev86 now installs into the default /usr/bin rather than /usr/sbin.
---
compilers/dev86/BUILD | 7 -------
compilers/dev86/BUILD.x86_64 | 9 ---------
compilers/dev86/DETAILS | 17 ++++++++---------
compilers/dev86/DETAILS.x86_64 | 26 --------------------------
devel/make/BUILD | 13 ++++---------
devel/make/DETAILS | 7 +++++--
6 files changed, 17 insertions(+), 62 deletions(-)
diff --git a/compilers/dev86/BUILD b/compilers/dev86/BUILD
deleted file mode 100644
index 02fc26a..0000000
--- a/compilers/dev86/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
- sedit "s:PREFIX)/bin:PREFIX)/sbin:" Makefile &&
-
- default_make
-
-) > $C_FIFO 2>&1
diff --git a/compilers/dev86/BUILD.x86_64 b/compilers/dev86/BUILD.x86_64
deleted file mode 100644
index 02072f7..0000000
--- a/compilers/dev86/BUILD.x86_64
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
- patch_it $SOURCE_CACHE/$SOURCE1 0 &&
-
- sedit "s:PREFIX)/bin:PREFIX)/sbin:" Makefile &&
-
- default_make
-
-) > $C_FIFO 2>&1
diff --git a/compilers/dev86/DETAILS b/compilers/dev86/DETAILS
index a9c9ca2..c48245b 100644
--- a/compilers/dev86/DETAILS
+++ b/compilers/dev86/DETAILS
@@ -1,24 +1,23 @@
MODULE=dev86
- VERSION=0.16.17
+ VERSION=0.16.18
SOURCE=Dev86src-$VERSION.tar.gz
SOURCE_URL[0]=$MIRROR_URL
SOURCE_URL[1]=http://www.debath.co.uk/$MODULE
- SOURCE_VFY=sha1:0bfe55c7a5e11d72f19f26cb0383178605951c72
+ SOURCE_VFY=sha1:da665d855963419cac5578736417cae8d1f8b5b0
WEB_SITE=http://www.debath.co.uk
- MODULE_PREFIX=${DEV86_INSTALL_DIR:-/opt/dev86}
ENTERED=20071004
- UPDATED=20100313
+ UPDATED=20110110
SHORT="Bruce Evan's C compiler, related assembler and linker"
PSAFE=no
cat << EOF
-This is based on Bruce Evans's C compiler with additonal code,
-including a reasonable C library for ELKS DOS or standalone,
+This is based on Bruce Evans's C compiler with additional code,
+including a reasonable C library for ELKS DOS or standalone,
written by myself and others.
-This is the source mainly for use with Linux i386 but should work
-with other unix versions, within Linux the assembler and linker
-are used for bootblocks, DOSEMU and other packages.
+This is the source mainly for use with Linux i386 but should work
+with other unix versions. Within Linux the assembler and linker
+are used for bootblocks, DOSEMU and other packages.
Includes bcc, as86 and more.
EOF
diff --git a/compilers/dev86/DETAILS.x86_64 b/compilers/dev86/DETAILS.x86_64
deleted file mode 100644
index f72b042..0000000
--- a/compilers/dev86/DETAILS.x86_64
+++ /dev/null
@@ -1,26 +0,0 @@
- MODULE=dev86
- VERSION=0.16.17
- SOURCE=Dev86src-$VERSION.tar.gz
- SOURCE1=dev86-0.16.17.x86_64.02.patch
- SOURCE_URL[0]=$MIRROR_URL
- SOURCE_URL[1]=http://www.debath.co.uk/$MODULE
- SOURCE1_URL=$PATCH_URL
- SOURCE_VFY=sha1:0bfe55c7a5e11d72f19f26cb0383178605951c72
- SOURCE1_VFY=sha1:ac1a0deca4c560565ccc431709a97e200bb0adf3
- WEB_SITE=http://www.debath.co.uk
- ENTERED=20071004
- UPDATED=20100313
- SHORT="Bruce Evan's C compiler, related assembler and linker"
- PSAFE=no
-
-cat << EOF
-This is based on Bruce Evans's C compiler with additonal code,
-including a reasonable C library for ELKS DOS or standalone,
-written by myself and others.
-
-This is the source mainly for use with Linux i386 but should work
-with other unix versions, within Linux the assembler and linker
-are used for bootblocks, DOSEMU and other packages.
-
-Includes bcc, as86 and more.
-EOF
diff --git a/devel/make/BUILD b/devel/make/BUILD
index 5734cd9..099b8a0 100644
--- a/devel/make/BUILD
+++ b/devel/make/BUILD
@@ -1,13 +1,8 @@
(
- ./configure --build=$BUILD \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- $OPTS &&
- make &&
- prepare_install &&
- make install &&
- chmod a-s /usr/bin/make
+ # Patches to compile dev86 0.16.18, as in Arch Linux
+ patch_it $SOURCE2 1 &&
+
+ default_build
) > $C_FIFO 2>&1
diff --git a/devel/make/DETAILS b/devel/make/DETAILS
index 3a95650..c17f779 100644
--- a/devel/make/DETAILS
+++ b/devel/make/DETAILS
@@ -1,16 +1,19 @@
MODULE=make
VERSION=3.82
SOURCE=$MODULE-$VERSION.tar.bz2
+ SOURCE2=make-3.82-savannah-bugs-30612-30723.patch.bz2
SOURCE_URL[0]=$GNU_URL/$MODULE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
+ SOURCE2_URL=$PATCH_URL
SOURCE_VFY=sha1:b8a8a99e4cb636a213aad3816dda827a92b9bbed
+ SOURCE2_VFY=sha1:6b558158940710b0135e31eacfdbef7762945876
WEB_SITE=http://make.paulandlesley.org
ENTERED=20010922
- UPDATED=20060812
+ UPDATED=20110108
SHORT="make generates executables and other non-source programs"
cat << EOF
-make - Generates executables and other non-source programs
+make - Generates executables and other non-source programs.
Make examines a set of related files, determines which of them are out
of date, and runs just the commands necessary to bring them back up to
date. Make is typically used to compile and link programs, but it can be
More information about the Lunar-commits
mailing list