Changeset 2427

Timestamp:

12/30/07 14:20:56 (1 year ago)

Author:

taj

Message:

* relaytool: Apply patch from res in ticket #52. Now, if a lib cannot be relaytooled for some reason, a stub that ensures libwhatever_is_present is defined will be generated.

Files:

• apbuild/trunk/ChangeLog (modified) (1 diff)
• apbuild/trunk/relaytool (modified) (2 diffs)

apbuild/trunk/ChangeLog

@@ +1 @@
+Sun Dec 30 19:17:03 UTC 2007  Taj Morton  <tajmorton@gmail.com>
+        * relaytool: Apply patch from res in ticket #52. Now, if a lib cannot be relaytooled
+          for some reason, a stub that ensures libwhatever_is_present is defined will be
+          generated.
+
-Sun Sep 30 00:29:13 UTC 2007  Taj Morton  <tajmorton@gmail.com>
-        * relaytool: When multi-linking, use the first SONAME passed to --multilink

apbuild/trunk/relaytool

@@ -376 +376 @@
-}
-
+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
@@ -492 +528 @@
-            fi
-        elif $found && ! $arch_ok; then
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-            echo -n "$a "