Ticket #52: relaytool-stub-c.diff

bin/relaytool

@@ -366 +367 @@
-    
-}
-
+function fakerelay() {
+    lib="$1"
+    libname=$( echo $( basename "$lib" ) | sed 's/\.so.*//' | tr '-' '_' | tr '.' '_' )
+    soname=$( objdump -x "$lib" |grep SONAME | awk '{print $2}' )
+    outfile="$outdir/`basename "$soname"`.stub.c"
+
+    echo -n "$outfile"
+
+    cat <<EOF >"$outfile"
+/* automatically generated: `date` by `id -un`@`uname -n`, do not edit
+ *
+ * Built by relaytool, a program for building delay-load jumptables
+ * relaytool is (C) 2004 Mike Hearn <mike@navi.cx>
+ * See http://autopackage.org/ for details.
+ */
+
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+/* 1 if present, 0 if not */
+int ${libname}_is_present = 1;
+
+/* 1 if present, 0 if not, 0 with warning to stderr if lib not present or symbol not found */
+int ${libname}_symbol_is_present(char * s)
+{
+    return 1;
+}
+
+#ifdef __cplusplus
+    }
+#endif
+EOF
+    
+}
+
-no_replace=false
-replace_all=false
-arch_ok=false
-arch_ptr_size=0
@@ -465 +506 @@
-                        echo -n "$stubobj "
-                    fi
-
+                    echo -n "-l$lib "
+                    
+                    spfound=true
+                    break;
+                fi
+            done
+
+            if ! $spfound; then
+                error could not find "$lib" in search path
+            fi
+        elif $found && ! $arch_ok; then
+            #echo -n "-Dlib${lib}_is_present -D\"lib${lib}_symbol_is_present(sym)=1\" $a "
+            #libname=$( echo $( basename "$lib" ) | sed 's/\.so.*//' | tr '-' '_' | tr '.' '_' )
+            #echo -n "-Dlib${libname}_is_present -Dlib${libname}_symbol_is_present(sym)=1 $a "           
+             
+            # yes, so let's find its absolute filename by checking in each search path directory
+            spfound=false
+            for d in ${searchpath[@]}; do
+                if [ -e "$d/lib$lib.so" ]; then
+                
+                    absname=$( readfinallink "$d/lib$lib.so" )
+                    if [ $? != 0 ] || [ ! -f "$absname" ]; then
+                        error broken symlink "$absname"
+                    fi
+                    
+                    stubfile=$( fakerelay "$absname" )
+
+                    # now we have to compile the stub
+                    if [ $? == 0 ]; then
+                        stubobj=$( echo "$stubfile" | sed 's/\.c$/\.o/' )
+                        # remove -include flags from CFLAGS, if any
+                        CFLAGS=$( echo $CFLAGS | sed 's/-include .*\.h//g' )
+                        ${CC:-gcc} ${CFLAGS} -fPIC -c -o "$stubobj" "$stubfile" 2>/dev/tty
+                        echo -n "$stubobj "
+                    fi
+
-                    if $no_replace; then
-                        echo -n "-l$lib "
-                    fi
@@ -477 +554 @@
-            if ! $spfound; then
-                error could not find "$lib" in search path
-            fi
-        elif $found && ! $arch_ok; then
-            echo -n "-Dlib${lib}_is_present -D\"lib${lib}_symbol_is_present(sym)=1\" $a "
-            libname=$( echo $( basename "$lib" ) | sed 's/\.so.*//' | tr '-' '_' | tr '.' '_' )
-            echo -n "-Dlib${libname}_is_present -Dlib${libname}_symbol_is_present(sym)=1 $a "            
-        else
-            echo -n "$a "
-        fi