Avoid makensis printing all symbols from gcc runtime libs.
authorWerner Koch <wk@gnupg.org>
Fri, 10 May 2013 11:04:00 +0000 (13:04 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 10 May 2013 16:48:58 +0000 (18:48 +0200)
* configure.ac: Store gcc runtile libs under a different name
* src/inst-gpg4win.nsi: Adjust for that name change.

.gitignore
configure.ac
src/inst-gpg4win.nsi

index fcf20df..202252b 100644 (file)
@@ -73,5 +73,6 @@ src/mingwm10.dll
 /src/COMPONENTS-list.tmp
 
 /web/
-/src/libgcc_s_sjlj-1.dll
-/src/libstdc++-6.dll
+
+/src/libgcc_s_sjlj-1.dll-x
+/src/libstdc++-6.dll-x
index 22d2003..e9cd5a5 100644 (file)
@@ -258,7 +258,7 @@ if test "$libgcc_dll" = "no"; then
   missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
 else
   if test -r "$libgcc_dll"; then
-    cp $libgcc_dll src/libgcc_s_sjlj-1.dll
+    cp $libgcc_dll src/libgcc_s_sjlj-1.dll-x
   else
     missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
   fi
@@ -279,7 +279,7 @@ if test "$libstdcpp_dll" = "no"; then
   missing_tools="libstdc++-6.dll $missing_tools"
 else
   if test -r "$libstdcpp_dll"; then
-    cp $libstdcpp_dll src/libstdc++-6.dll
+    cp $libstdcpp_dll src/libstdc++-6.dll-x
   else
     missing_tools="libstdc++-6.dll $missing_tools"
  fi
index f761735..584c873 100644 (file)
@@ -80,9 +80,11 @@ Section "-gpg4win" SEC_gpg4win
   File "${BUILD_DIR}/md5sum.exe"
 
   SetOutPath "$INSTDIR\pub"
-  # Install the mingw runtime libaries
-  File "${BUILD_DIR}/libstdc++-6.dll"
-  File "${BUILD_DIR}/libgcc_s_sjlj-1.dll"
+  # Install the mingw32 runtime libraries.  They are stored in the
+  # build directory with a different suffix, so that makensis does not
+  # list sumbol names.
+  File /oname=libstdc++-6.dll     "${BUILD_DIR}/libstdc++-6.dll-x"
+  File /oname=libgcc_s_sjlj-1.dll "${BUILD_DIR}/libgcc_s_sjlj-1.dll-x"
 
 !endif