From 3201bdbf1fd39418d942ac1d78b2a58df1957a77 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 15 Mar 2008 19:15:44 +0000 Subject: [PATCH] ucspi-unix: Fixed cross-compilation by using -lbg-sysdeps instead of -lsysdeps ./load unixclient env.o utoa.o `cat socket.lib` .../usr/bglibs/lib/libsysdeps.a: could not read symbols: Archive has no index; run ranlib to add one collect2: ld returned 1 exit status make: *** [unixclient] Error 1 they are symlinked, but -lbg-sysdeps pass and -lsysdeps doesn't --- network/ucspi-unix/bglibs.patch.cross | 30 +++++++++++++++++++++++ network/ucspi-unix/cross-conf.patch.cross | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 network/ucspi-unix/bglibs.patch.cross diff --git a/network/ucspi-unix/bglibs.patch.cross b/network/ucspi-unix/bglibs.patch.cross new file mode 100644 index 000000000..ff9095cc8 --- /dev/null +++ b/network/ucspi-unix/bglibs.patch.cross @@ -0,0 +1,30 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../ucspi-unix/bglibs.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 --- + +when cross-compiling ucspi-unix fails because libsysdeps.a isn't indexed, but +libbg-sysdeps.a is... but they are symlinked! *weird* + +--- ./Makefile.orig 2008-03-15 18:49:54.000000000 +0000 ++++ ./Makefile 2008-03-15 18:50:06.000000000 +0000 +@@ -63,7 +63,7 @@ + load: conf-ld + ( echo '#!/bin/sh';\ + echo 'main="$$1"; shift';\ +- echo exec `head -n 1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\ ++ echo exec `head -n 1 conf-ld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps;\ + ) >load + chmod 755 load + diff --git a/network/ucspi-unix/cross-conf.patch.cross b/network/ucspi-unix/cross-conf.patch.cross index 5ce60514c..e3a90fed9 100644 --- a/network/ucspi-unix/cross-conf.patch.cross +++ b/network/ucspi-unix/cross-conf.patch.cross @@ -76,7 +76,7 @@ diff -ruN ucspi-unix-0.36/Makefile ucspi-unix-0.36-cross-conf/Makefile +host-load: conf-hostld + ( echo '#!/bin/sh';\ + echo 'main="$$1"; shift';\ -+ echo exec `head -1 conf-hostld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lsysdeps;\ ++ echo exec `head -1 conf-hostld` '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps;\ + ) >host-load + chmod 755 host-load +