package-update/develop/bglibs/installer-conf.patch.cross

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../bglibs/installer-conf.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 ---

Author: Christian Wiese <morfoh@opensde.org>
Origin: OpenSDE (http://opensde.org)
Description: Add support for defining which installer has to be used, because
             for cross-compiling bglibs we need to use a bg-installer that was
             built 'natively' with the compiler of the build system.
             Instead of using 'bg-installer' directly we create the 'installer'
             wrapper script for being able to explicitely define the path to
             the installer we want to use via 'conf-installer'.

diff -ruN bglibs-1.102/Makefile bglibs-1.102-cross-conf/Makefile
--- bglibs-1.102/Makefile	2006-10-30 23:11:21.000000000 +0200
+++ bglibs-1.102-cross/Makefile	2007-04-14 05:50:39.767276500 +0300
@@ -601,9 +601,16 @@
 fmt/unum.o: compile fmt/unum.c fmt/number.h selftest.c iobuf/iobuf.h iobuf/common.h iobuf/ibuf.h iobuf/common.h iobuf/obuf.h iobuf/common.h msg/msg.h str/str.h
 	./compile fmt/unum.c
 
-install: bg-installer INSTHIER conf-bin conf-include conf-lib conf-man
-	./bg-installer -v <INSTHIER
-	./bg-installer -c <INSTHIER
+installer: conf-installer
+	(  \
+	  echo '#!/bin/sh';\
+	  echo exec `head -n 1 conf-installer` ; \
+	) >installer
+	chmod 755 installer
+
+install: bg-installer INSTHIER installer conf-bin conf-include conf-lib conf-man
+	./installer -v <INSTHIER
+	./installer -c <INSTHIER
 
 instlib/installer.o: compile instlib/installer.c msg/msg.h msg/wrap.h path/path.h str/str.h str/str.h instlib/installer.h
 	./compile instlib/installer.c
@@ -987,11 +994,11 @@
 	./makeshlib libbg.la adt/adt_sp.lo adt/ghash_add.lo adt/ghash_foreach.lo adt/ghash_free.lo adt/ghash_get.lo adt/ghash_init.lo adt/ghash_insert.lo adt/ghash_iter.lo adt/ghash_rebuild.lo adt/ghash_rehash.lo adt/ghash_remove.lo adt/ghash_search.lo adt/gqueue_pop.lo adt/gqueue_push.lo adt/gqueue_top.lo adt/gstack_pop.lo adt/gstack_push.lo adt/gstack_top.lo adt/hashb.lo adt/hashs.lo base64/asc2bin.lo base64/bin2asc.lo base64/decode_line.lo base64/decode_part.lo base64/encode_line.lo base64/encode_part.lo cdb/cdb.lo cdb/cdbhash.lo cdb/find.lo cdb/get.lo cdb/getnext.lo cdb/make.lo cdb/read.lo crc/crc16_arc_table.lo crc/crc16_ccitt_table.lo crc/crc16_xmodem_table.lo crc/crc32_table.lo crc/crc32c_table.lo crc/crc64_table.lo crc/gcrc16fwd.lo crc/gcrc16rfl.lo crc/gcrc32fwd.lo crc/gcrc32rfl.lo crc/gcrc64fwd.lo crc/gcrc64rfl.lo crypto/hmac-md5.lo crypto/hmac-sha1.lo crypto/hmac-sha256.lo crypto/hmac-sha384.lo crypto/hmac-sha512.lo crypto/hmac.lo crypto/md4.lo crypto/md5-crypt.lo crypto/md5.lo crypto/sha1.lo crypto/sha256.lo crypto/sha384.lo crypto/sha512.lo crypto/surf.lo dict/add.lo dict/dicthash.lo dict/foreach.lo dict/free.lo dict/get.lo dict/init.lo dict/load_list.lo dict/load_map.lo dict/str_free.lo fmt/char.lo fmt/chars.lo fmt/lcase.lo fmt/multi.lo fmt/pad.lo fmt/sdec.lo fmt/sign_pad.lo fmt/slldec.lo fmt/sllnum.lo fmt/snum.lo fmt/uHex.lo fmt/ucase.lo fmt/udec.lo fmt/uhex.lo fmt/ullHex.lo fmt/ulldec.lo fmt/ullhex.lo fmt/ullnum.lo fmt/unum.lo iobuf/ibuf_copytofd.lo iobuf/ibuf_getc.lo iobuf/ibuf_getnetstring.lo iobuf/ibuf_gets.lo iobuf/ibuf_getstr.lo iobuf/ibuf_getstr_crlf.lo iobuf/ibuf_getu.lo iobuf/ibuf_init.lo iobuf/ibuf_open.lo iobuf/ibuf_openreadclose.lo iobuf/ibuf_peek.lo iobuf/ibuf_read.lo iobuf/ibuf_readall.lo iobuf/ibuf_refill.lo iobuf/ibuf_seek.lo iobuf/ibuf_status.lo iobuf/ibuf_stdin.lo iobuf/ibuf_tell.lo iobuf/iobuf_close.lo iobuf/iobuf_copy.lo iobuf/iobuf_init.lo iobuf/iobuf_timeout.lo iobuf/obuf_close.lo iobuf/obuf_copyfromfd.lo iobuf/obuf_digits.lo iobuf/obuf_endl.lo iobuf/obuf_flush.lo iobuf/obuf_init.lo iobuf/obuf_open.lo iobuf/obuf_pad.lo iobuf/obuf_put2s.lo iobuf/obuf_put3s.lo iobuf/obuf_put4s.lo iobuf/obuf_put5s.lo iobuf/obuf_put6s.lo iobuf/obuf_put7s.lo iobuf/obuf_putc.lo iobuf/obuf_putf.lo iobuf/obuf_putnetstring.lo iobuf/obuf_putns.lo iobuf/obuf_putsflush.lo iobuf/obuf_putsllnumw.lo iobuf/obuf_putsnumw.lo iobuf/obuf_putullnumw.lo iobuf/obuf_putunumw.lo iobuf/obuf_seek.lo iobuf/obuf_sign_pad.lo iobuf/obuf_stderr.lo iobuf/obuf_stdout.lo iobuf/obuf_sync.lo iobuf/obuf_write.lo misc/random.lo misc/strtou.lo misc/ucspi.lo misc/utoa.lo misc/utoa2.lo msg/common.lo msg/commonf.lo msg/debug.lo msg/debug_bits.lo msg/debug_init.lo msg/debugf.lo msg/die.lo msg/dief.lo msg/error.lo msg/errorf.lo msg/oom.lo msg/show_pid.lo msg/warn.lo msg/warnf.lo msg/wrap_alloc.lo msg/wrap_chdir.lo msg/wrap_exit.lo msg/wrap_str.lo net/accept4.lo net/accept6.lo net/acceptu.lo net/bind4.lo net/bind6.lo net/bindu.lo net/broadcast.lo net/connect4.lo net/connect4_timeout.lo net/connect6.lo net/connect6_timeout.lo net/connected.lo net/connectu.lo net/connectu_timeout.lo net/cork.lo net/getaddr4.lo net/getaddr6.lo net/ipv4_addr.lo net/ipv4_format.lo net/ipv4_scan.lo net/ipv6_addr.lo net/ipv6_format.lo net/ipv6_scan.lo net/linger.lo net/listen.lo net/notcpdelay.lo net/pairdgm.lo net/pairstr.lo net/recv4.lo net/recv6.lo net/recvfd.lo net/recvu.lo net/resolve_error.lo net/resolve_ipv4addr.lo net/resolve_ipv4name.lo net/reuse.lo net/send4.lo net/send6.lo net/sendfd.lo net/sendu.lo net/shutdown.lo net/tcp4.lo net/tcp6.lo net/udp4.lo net/udp6.lo net/uncork.lo net/unixdgm.lo net/unixstr.lo path/contains.lo path/fnmatch.lo path/match.lo path/merge.lo path/mkdirs.lo path/mktemp.lo str/alloc.lo str/buildmap.lo str/case_glob.lo str/case_match.lo str/case_start.lo str/cat.lo str/cat2s.lo str/cat3s.lo str/cat4s.lo str/cat5s.lo str/cat6s.lo str/catf.lo str/catiw.lo str/catiwll.lo str/catns.lo str/catsllnum.lo str/catsnum.lo str/catullnum.lo str/catunum.lo str/catuw.lo str/catuwll.lo str/catxw.lo str/catxwll.lo str/cmp.lo str/copy.lo str/copy2s.lo str/copy3
 
 libcompile: conf-cc
-	(  \
+	( if `head -n 1 conf-libtool` --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
 	  echo '#!/bin/sh'; \
 	  echo 'source=$$1; shift'; \
 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
-	  echo exec libtool --mode=compile --silent `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
+	  echo exec `head -n 1 conf-libtool` --mode=compile --silent $$tag `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
 	) >libcompile
 	chmod 755 libcompile
 
@@ -1023,17 +1030,17 @@
 	( echo '#!/bin/sh'; \
 	  echo 'main="$$1"; shift';\
 	  echo 'rm -f "$$main"';\
-	  echo 'ar cr "$$main" $${1+"$$@"}';\
-	  echo 'ranlib "$$main"';\
+	  echo '`head -n 1 conf-ar` cr "$$main" $${1+"$$@"}';\
+	  echo '`head -n 1 conf-ranlib` "$$main"';\
 	) >makelib
 	chmod 755 makelib
 
 makeshlib: conf-ld conf-lib LIBVERSION Makefile
-	( if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
+	( if `head -n 1 conf-libtool` --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
 	  echo '#!/bin/sh'; \
 	  echo 'lib="$$1"; shift';\
 	  echo 'rm -f "$$lib"';\
-	  echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\
+	  echo `head -n 1 conf-libtool` --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\
 	) >makeshlib
 	chmod 755 makeshlib
 
diff -ruN bglibs-1.102/conf-ar bglibs-1.102-cross-conf/conf-ar
--- bglibs-1.102/conf-ar	1970-01-01 02:00:00.000000000 +0200
+++ bglibs-1.102-cross-conf/conf-ar	2007-04-14 04:48:21.373641500 +0300
@@ -0,0 +1 @@
+ar
diff -ruN bglibs-1.102/conf-installer bglibs-1.102-cross-conf/conf-installer
--- bglibs-1.102/conf-installer	1970-01-01 02:00:00.000000000 +0200
+++ bglibs-1.102-cross-conf/conf-installer	2007-04-14 20:00:21.109411250 +0300
@@ -0,0 +1 @@
+./bg-installer
diff -ruN bglibs-1.102/conf-libtool bglibs-1.102-cross-conf/conf-libtool
--- bglibs-1.102/conf-libtool	1970-01-01 02:00:00.000000000 +0200
+++ bglibs-1.102-cross-conf/conf-libtool	2007-04-14 04:27:44.956370250 +0300
@@ -0,0 +1 @@
+libtool
diff -ruN bglibs-1.102/conf-ranlib bglibs-1.102-cross-conf/conf-ranlib
--- bglibs-1.102/conf-ranlib	1970-01-01 02:00:00.000000000 +0200
+++ bglibs-1.102-cross-conf/conf-ranlib	2007-04-14 04:27:03.289766250 +0300
@@ -0,0 +1 @@
+ranlib