From 9a970519407b6774c963537d69d1705c6a29d941 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 20 Mar 2008 22:39:52 +0000 Subject: [PATCH] runit: Fixed to cross compile correctly --- .../dont_run_target_binaries.patch.cross | 39 +++++++++++++++++++ base/runit/ranlib.patch | 34 ++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 base/runit/dont_run_target_binaries.patch.cross create mode 100644 base/runit/ranlib.patch diff --git a/base/runit/dont_run_target_binaries.patch.cross b/base/runit/dont_run_target_binaries.patch.cross new file mode 100644 index 000000000..92fdd5ebc --- /dev/null +++ b/base/runit/dont_run_target_binaries.patch.cross @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../runit/dont_run_target_binaries.patch.cross +# Copyright (C) 2008 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./src/Makefile.orig 2008-03-19 03:05:50.000000000 +0000 ++++ ./src/Makefile 2008-03-19 03:08:52.000000000 +0000 +@@ -234,7 +234,6 @@ + + hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ + tryshsgr.c warn-shsgr +- ./chkshsgr || ( cat warn-shsgr; exit 1 ) + ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h + + haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c +--- ./src/choose.sh.orig 2008-03-19 03:12:08.000000000 +0000 ++++ ./src/choose.sh 2008-03-19 03:13:37.000000000 +0000 +@@ -9,10 +9,6 @@ + *l*) ./load $2 >/dev/null 2>&1 || result="$3" ;; + esac + +-case "$1" in +- *r*) ./$2 >/dev/null 2>&1 || result="$3" ;; +-esac +- + rm -f $2.o $2 + + exec cat "$result" diff --git a/base/runit/ranlib.patch b/base/runit/ranlib.patch new file mode 100644 index 000000000..5f5df30dc --- /dev/null +++ b/base/runit/ranlib.patch @@ -0,0 +1,34 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../runit/ranlib.patch +# Copyright (C) 2008 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./src/print-ar.sh.orig 2008-03-19 03:21:50.000000000 +0000 ++++ ./src/print-ar.sh 2008-03-19 03:22:21.000000000 +0000 +@@ -1,7 +1,7 @@ + cat warn-auto.sh + echo 'main="$1"; shift' + echo 'rm -f "$main"' +-echo 'ar cr "$main" ${1+"$@"}' ++echo '${AR:-ar} cr "$main" ${1+"$@"}' + case "`cat systype`" in + sunos-5.*) ;; + unix_sv*) ;; +@@ -10,5 +10,5 @@ + dgux-*) ;; + hp-ux-*) ;; + sco*) ;; +- *) echo 'ranlib "$main"' ;; ++ *) echo '${RANLIB:-ranlib} "$main"' ;; + esac