meta/packages/mozilla/minimo/host_ldflags_fix.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62

Index: mozilla/nsprpub/config/rules.mk
===================================================================
--- mozilla.orig/nsprpub/config/rules.mk	2005-01-04 21:27:36.000000000 +0000
+++ mozilla/nsprpub/config/rules.mk	2005-09-30 11:27:33.000000000 +0000
@@ -87,6 +87,9 @@
 CCC=$(HOST_CXX)
 CFLAGS=$(HOST_CFLAGS)
 CXXFLAGS=$(HOST_CXXFLAGS)
+LDFLAGS=$(HOST_LDFLAGS)
+RANLIB=$(HOST_RANLIB)
+AR=$(HOST_AR)
 endif
 endif
 endif
Index: mozilla/configure.in
===================================================================
--- mozilla.orig/configure.in	2005-03-30 17:57:38.000000000 +0000
+++ mozilla/configure.in	2005-09-30 11:36:44.000000000 +0000
@@ -5612,13 +5612,18 @@
 fi
 
 if test -n "$CROSS_COMPILE"; then
-    if test -z "$HOST_LIBIDL_CONFIG"; then
+     if test -z "$HOST_LIBIDL_CONFIG"; then
+        AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
         HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
     fi
     if test -n "$HOST_LIBIDL_CONFIG"; then
+        AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
         HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+        AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
         HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+        AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
     else
+        AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
     fi
Index: mozilla/configure
===================================================================
--- mozilla.orig/configure	2005-03-30 17:58:47.000000000 +0000
+++ mozilla/configure	2005-09-30 11:38:36.000000000 +0000
@@ -16572,11 +16572,18 @@
 
 if test -n "$CROSS_COMPILE"; then
     if test -z "$HOST_LIBIDL_CONFIG"; then
+        echo "HOST_LIBIDL_CONFIG nto defined"
         HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
     fi
-    if test -n "$HOST_LIBIDL_CONFIG"; then
+    if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then
+        echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
+        _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+	PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
         HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+        echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
         HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+        echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
+	PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
     else
         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100

#!/bin/bash
#
# This utility extracts an SDK image tarball using pseudo, and stores
# the pseudo database in var/pseudo within the rootfs. If you want to
# boot QEMU using an nfsroot, you *must* use this script to create the
# rootfs to ensure it is done correctly with pseudo.
#
# Copyright (c) 2010 Intel Corp.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

function usage() {
	echo "Usage: $0 <poky-sdk-tarball> <extract-dir>"
}

if [ $# -ne 2 ]; then
	usage
	exit 1
fi

SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot`
if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
    echo "Error: Unable to find the poky-find-native-sysroot script"
    echo "Did you forget to source your Poky environment script?"
    exit 1
fi
. $SYSROOT_SETUP_SCRIPT
PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"

ROOTFS_TARBALL=$1
SDK_ROOTFS_DIR=$2

if [ ! -e "$ROOTFS_TARBALL" ]; then
   	echo "Error: sdk tarball '$ROOTFS_TARBALL' does not exist"
   	usage
   	exit 1
fi

# Convert SDK_ROOTFS_DIR to a full pathname
if [[ ${SDK_ROOTFS_DIR:0:1} != "/" ]]; then
	SDK_ROOTFS_DIR=$(pwd)/$SDK_ROOTFS_DIR
fi

TAR_OPTS=""
if [[ "$ROOTFS_TARBALL" =~ tar\.bz2$ ]]; then
	TAR_OPTS="-xjf"
fi
if [[ "$ROOTFS_TARBALL" =~ tar\.gz$ ]]; then
	TAR_OPTS="-xzf"
fi
if [[ "$ROOTFS_TARBALL" =~ \.tar$ ]]; then
	TAR_OPTS="-xf"
fi
if [ -z "$TAR_OPTS" ]; then
	echo "Error: Unable to determine sdk tarball format"
	echo "Accepted types: .tar / .tar.gz / .tar.bz2"
	exit 1
fi

if [ ! -d "$SDK_ROOTFS_DIR" ]; then
	echo "Creating directory $SDK_ROOTFS_DIR"
	mkdir -p "$SDK_ROOTFS_DIR"
fi

if [ -e "$SDK_ROOTFS_DIR/var/pseudo" ]; then
	echo "Error: $SDK_ROOTFS_DIR/var/pseudo already exists!"
	echo "Please delete the entire rootfs tree manually if this is really what you want"
	exit 1
fi

mkdir -p "$SDK_ROOTFS_DIR/var/pseudo"
touch "$SDK_ROOTFS_DIR/var/pseudo/pseudo.pid"
PSEUDO_LOCALSTATEDIR="$SDK_ROOTFS_DIR/var/pseudo"
export PSEUDO_LOCALSTATEDIR

echo "Extracting rootfs tarball using pseudo..."
echo "$PSEUDO $PSEUDO_OPTS tar -C \"$SDK_ROOTFS_DIR\" $TAR_OPTS \"$ROOTFS_TARBALL\""
$PSEUDO $PSEUDO_OPTS tar -C "$SDK_ROOTFS_DIR" $TAR_OPTS "$ROOTFS_TARBALL"

DIRCHECK=`ls -l "$SDK_ROOTFS_DIR" | wc -l`
if [ "$DIRCHECK" -lt 5 ]; then
	echo "Warning: I don't see many files in $SDK_ROOTFS_DIR"
	echo "Please double-check the extraction worked as intended"
	exit 0
fi

echo "SDK image successfully extracted to $SDK_ROOTFS_DIR"

exit 0