Changeset 23b6afb for scripts/funcs

Timestamp:

Feb 21, 2006, 12:15:50 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

12ba0a4

Parents:

eec901a

Message:

r564@server (orig r562): jim | 2005-06-07 20:12:28 -0700
Mirrored from jg555.com on Tue Jun 7 20:12:17 PDT 2005
----------------------------------------------------------------------

File:

• scripts/funcs/multiarch-funcs.sh (modified) (2 diffs)

scripts/funcs/multiarch-funcs.sh

@@ -51 +51 @@
                     sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" `
 
-   if [ "${MULTIARCH}" = "Y" ]; then
-      export PERL=`which_func perl-${BUILDENV}`
-      export PYTHON=`which_func python-${BUILDENV}`
-   else
-      export PERL=`which_func perl`
-      export PYTHON=`which_func python`
-   fi
-
 }
 
@@ -156 +148 @@
    if [ ! -d ${wrapperdir} ]; then mkdir -p ${wrapperdir} ; fi
 
-   cat > ${wrapper} <<EOF
-#!/bin/sh
-
-# Set to default if BUILDENV not set
-if [ -z \${BUILDENV} ]; then BUILDENV=${DEFAULTENV} ; fi
-export BUILDENV
-exec \${0}-\${BUILDENV} \${@}
+   cat > wrapper.c <<"EOF"
+/*
+
+   wrapper.c - c wrapper for cross-lfs multiarch handling
+   ------------------------------------------------------
+   Created By:  Ryan Oliver <ryan.oliver@pha.com.au> 20050606
+
+   $LastChangedBy$
+   $LastChangedDate$
+   $LastChangedRevision$
+   $HeadURL$
+
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+
+/* TODO: should check for __x86_64__ , __powerpc64__ etc and set accordingly */
+#ifndef DEFAULTENV
+#define DEFAULTENV "64"
+#endif
+
+int main(int argc, char **argv) {
+
+        char *filename;
+        char *buildenv;
+
+        if(!(buildenv = getenv("BUILDENV")))
+                buildenv = DEFAULTENV;
+
+        filename = (char *) malloc(strlen(argv[0]) + strlen(buildenv) + 2);
+        strcpy(filename, argv[0]);
+        strcat(filename, "-");
+        strcat(filename, buildenv);
+
+        execvp(filename, argv);
+        perror(argv[0]);
+        free(filename);
+
+}
 EOF
 
+   OLD_BUILDENV="${BUILDENV}"
+   BUILDENV="${DEFAULTENV}"
+   setup_multiarch
+
+   ${CC-gcc} ${ARCH_CFLAGS} -DDEFAULTENV=\"${DEFAULTENV}\" \
+       wrapper.c -o ${wrapper}
    chmod 755 ${wrapper}
+
+   BUILDENV="${OLD_BUILDENV}"
 
 }