Skip to content

Commit

Permalink
Switch to gcc 4.8
Browse files Browse the repository at this point in the history
Unfortunately, with gcc 4.8, libc now is called
- libgcc_s_sjlj-1.dll on 32Bit Windows
- libgcc_s_seh-1.dll  on 64Bit Windows

This patch adapts to that fact.

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
  • Loading branch information
pstorz authored and Marco van Wieringen committed May 5, 2013
1 parent 7e0c09d commit dd6abc8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion platforms/win32/winbareos-nsi.spec
Expand Up @@ -66,7 +66,7 @@ mkdir $RPM_BUILD_ROOT/release64
for file in \
bareos-tray-monitor.exe bat.exe bareos-fd.exe bconsole.exe \
bpipe-fd.dll libbareos.dll libbareosfind.dll \
libcrypto-8.dll libgcc_s_sjlj-1.dll libhistory6.dll \
libcrypto-8.dll libgcc_s_*-1.dll libhistory6.dll \
libreadline6.dll libssl-8.dll libstdc++-6.dll \
libtermcap-0.dll pthreadGCE2.dll zlib1.dll\
QtCore4.dll QtGui4.dll liblzo2-2.dll libpng15-15.dll\
Expand Down
16 changes: 9 additions & 7 deletions platforms/win32/winbareos.nsi
Expand Up @@ -275,7 +275,7 @@ SectionIn 1 2 3
File "libbareos.dll"
File "libbareosfind.dll"
File "libcrypto-8.dll"
File "libgcc_s_sjlj-1.dll"
File "libgcc_s_*-1.dll"
File "libssl-8.dll"
File "libstdc++-6.dll"
File "pthreadGCE2.dll"
Expand All @@ -299,7 +299,7 @@ SectionIn 2
File "bconsole.exe"
# File "libbareos.dll"
# File "libcrypto-8.dll"
# File "libgcc_s_sjlj-1.dll"
# File "libgcc_s_*-1.dll"
File "libhistory6.dll"
File "libreadline6.dll"
# File "libssl-8.dll"
Expand All @@ -323,7 +323,7 @@ SectionEnd
# File "bareos-tray-monitor.exe"
## File "libbareos.dll"
## File "libcrypto-8.dll"
## File "libgcc_s_sjlj-1.dll"
## File "libgcc_s_*-1.dll"
# File "libpng15-15.dll"
## File "libssl-8.dll"
## File "libstdc++-6.dll"
Expand All @@ -349,7 +349,7 @@ SectionIn 2
File "bat.exe"
# File "libbareos.dll"
# File "libcrypto-8.dll"
# File "libgcc_s_sjlj-1.dll"
# File "libgcc_s_*-1.dll"
File "libpng15-15.dll"
# File "libssl-8.dll"
# File "libstdc++-6.dll"
Expand Down Expand Up @@ -572,8 +572,10 @@ Function .onInit
File "/oname=$PLUGINSDIR\openssl.exe" "openssl.exe"
File "/oname=$PLUGINSDIR\sed.exe" "sed.exe"
File "/oname=$PLUGINSDIR\libcrypto-8.dll" "libcrypto-8.dll"
File "/oname=$PLUGINSDIR\libgcc_s_sjlj-1.dll" "libgcc_s_sjlj-1.dll"
# File /nonfatal "/oname=$PLUGINSDIR\libgcc_s_seh-1.dll" "libgcc_s_seh-1.dll"

File /nonfatal "/oname=$PLUGINSDIR\libgcc_s_sjlj-1.dll" "libgcc_s_sjlj-1.dll"
File /nonfatal "/oname=$PLUGINSDIR\libgcc_s_seh-1.dll" "libgcc_s_seh-1.dll"

File "/oname=$PLUGINSDIR\libssl-8.dll" "libssl-8.dll"
File "/oname=$PLUGINSDIR\libstdc++-6.dll" "libstdc++-6.dll"
File "/oname=$PLUGINSDIR\zlib1.dll" "zlib1.dll"
Expand Down Expand Up @@ -796,7 +798,7 @@ ConfDeleteSkip:
Delete "$INSTDIR\libbareos.dll"
Delete "$INSTDIR\libbareosfind.dll"
Delete "$INSTDIR\libcrypto-8.dll"
Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
Delete "$INSTDIR\libgcc_s_*-1.dll"
Delete "$INSTDIR\libhistory6.dll"
Delete "$INSTDIR\libreadline6.dll"
Delete "$INSTDIR\libssl-8.dll"
Expand Down

0 comments on commit dd6abc8

Please sign in to comment.