Ticket #41319: patch-bin-mklib.diff

bin/mklib

@@ -43 +43 @@
 ARCHOPT=""
 NOPREFIX=0
 EXPORTS=""
-
+ID=""
 
 #
 # Parse arguments
@@ -73 +73 @@
             echo '  -archopt OPT  specify an extra achitecture-specific option OPT'
             echo "  -noprefix     don't prefix library name with 'lib' nor add any suffix"
             echo '  -exports FILE only export the symbols listed in FILE'
+            echo '  -id NAME      Sets the id of the dylib (Darwin)'
             echo '  -h, --help    display this information and exit'
             exit 1
             ;;
@@ -142 +143 @@
             shift 1;
             EXPORTS=$1
             ;;
+        '-id')
+            shift 1;
+            ID=$1
+            ;;
         -*)
             echo "mklib: Unknown option: " $1 ;
             exit 1
@@ -185 +190 @@
     echo PATCH is $PATCH
     echo DEPS are $DEPS
     echo "EXPORTS in" $EXPORTS
+    echo ID is $ID
     echo "-----------------"
 fi
 
@@ -584 +590 @@
                 OPTS="${ARCHOPT} -bundle -multiply_defined suppress"
             else
                 LIBSUFFIX="dylib"
-                OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
+                if [ -z "$ID" ] ; then
+                    ID="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
+                fi
+                OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name ${ID}"
             fi
             LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
             LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"