diff options
| author | Julien ROZO | 2008-08-01 23:27:31 +0200 |
|---|---|---|
| committer | Julien ROZO | 2008-08-01 23:29:03 +0200 |
| commit | af16f81d209cc2e74ada8697838d622f665fdd7f (patch) | |
| tree | 90d8f7ee107409a2bc96a9e7492c20812e7d554e | |
| parent | d13362c7956d61f5f7ae3fd9d77c2b1e3961289d (diff) | |
dev86: disabled the build of elks on x86_64 arch, fixing bug #14160
(I've forgot to add the patch on my last commit ...)
| -rw-r--r-- | devel/dev86/HISTORY | 4 | ||||
| -rwxr-xr-x | devel/dev86/PRE_BUILD | 5 | ||||
| -rw-r--r-- | devel/dev86/dev86-noelks.patch | 15 |
3 files changed, 24 insertions, 0 deletions
diff --git a/devel/dev86/HISTORY b/devel/dev86/HISTORY index 2d9187df02..7225269b65 100644 --- a/devel/dev86/HISTORY +++ b/devel/dev86/HISTORY @@ -1,3 +1,7 @@ +2008-08-01 Julien "_kaze_" ROZO <julien@rozo.org> + * PRE_BUILD, dev86-noelks.patch: disables the build of elks on x86_64 arch, + fixes bug #14160 + 2008-07-14 Juuso Alasuutari <iuso@sourcemage.org> * BUILD: Forced single-job build, removed sedits. * PRE_BUILD: Added, moved sedits here. diff --git a/devel/dev86/PRE_BUILD b/devel/dev86/PRE_BUILD index ccf3173f0d..ab7e2f6e69 100755 --- a/devel/dev86/PRE_BUILD +++ b/devel/dev86/PRE_BUILD @@ -1,5 +1,10 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +# fix for bug 14160 +if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then + patch -p1 < $SCRIPT_DIRECTORY/dev86-noelks.patch +fi && + sed -i "s|-O2|$CFLAGS|" Makefile && sed -i "s|/man/|/share/man/|" Makefile diff --git a/devel/dev86/dev86-noelks.patch b/devel/dev86/dev86-noelks.patch new file mode 100644 index 0000000000..9fd46e9577 --- /dev/null +++ b/devel/dev86/dev86-noelks.patch @@ -0,0 +1,15 @@ +--- dev86-0.16.17/makefile.in.noelks 2006-01-25 17:03:02.000000000 -0500 ++++ dev86-0.16.17/makefile.in 2006-01-25 17:03:19.000000000 -0500 +@@ -89,10 +89,10 @@ + + #ifdef GNUMAKE + all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \ +- library lib-bsd alt-libs elksemu ++ library lib-bsd alt-libs + + install: check_config install-bcc install-man \ +- install-lib install-emu ++ install-lib + + install-all: install install-other + |