Changeset 99e4712

Timestamp:

Feb 21, 2006, 12:16:20 AM (19 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:

61c0e64

Parents:

0ee931e

Message:

r567@server (orig r565): ryan | 2005-06-08 02:22:20 -0700
(missing logfile from previous svk merge, diff -r559 for changes)

Create a c wrapper for use when doing multilib builds

create_wrapper now builds and installs a c wrapper as opposed to a shell
wrapper.

The file wrapper.c is created via a here doc... this will be subject to
change

The c wrapper avoids issues when an interpreter such as perl or python is
called from the shebang line of a script, where the contents of the script
would get passed to the shell of the wrapper, NOT to the required interpretor.

Due to this, the previous PERL and PYTHON env var hackery can be removed.

----------------------------------------------
Remove unneded which_func from multiarch_funcs
Minor edits to get the changelog in ;-)

Location:

scripts

Files:

• funcs/multiarch-funcs.sh (modified) (1 diff)
• untested/blfs-scripts/blfs-shared-mime-info.sh (modified) (1 diff)
• untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper.sh (modified) (1 diff)
• untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib.sh (modified) (1 diff)
• untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh (modified) (1 diff)
• untested/gnome-scripts/gnome-platform-scripts/gnome-platform-intltool.sh (modified) (1 diff)

scripts/funcs/multiarch-funcs.sh

@@ -53 +53 @@
 }
 
-which_func() {
-   type ${1} | \
-   sed -e 's@.* \(.*\)$@\1@g' \
-       -e 's@[()]@@g'
-}
-
-
 # Following function sets compiler options
 setup_multiarch() {

scripts/untested/blfs-scripts/blfs-shared-mime-info.sh

@@ -28 +28 @@
    >> ${LOGFILE} 2>&1 &&
 echo " o ALL OK" || barf
-

scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper.sh

@@ -49 +49 @@
    use_wrapper /usr/bin/scrollkeeper-config
 fi
+

scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib.sh

@@ -52 +52 @@
    >> ${LOGFILE} 2>&1 &&
 echo " o ALL OK" || barf
-

scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
 ### gnome-mime-data ###

scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-intltool.sh

@@ -27 +27 @@
    >> ${LOGFILE} 2>&1 &&
 echo " o ALL OK" || barf
-