Attachment 734 Details for Bug 6099 – x86_64 fix

[patch] x86_64 fix

openssl.spec.patch (text/plain), 1.73 KB, created by Kachalov Anton on 2005-02-11 21:48:42 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Kachalov Anton

Created: 2005-02-11 21:48:42 MSK

Size: 1.73 KB

patch

obsolete

>--- openssl.spec.orig	2004-05-09 01:52:25 +0400
>+++ openssl.spec	2004-08-30 03:22:36 +0400
>@@ -185,7 +185,20 @@
> 	ADD_ARGS=linux-sparcv9
> %endif
> 
>-./Configure shared -DSSL_ALLOW_ADH --prefix=%prefix --openssldir=%openssldir $ADD_ARGS
>+# change /usr/lib to /usr/lib64 if necessary
>+sed -e 	"s+$\$(INSTALL_PREFIX)\$(INSTALLTOP)$/lib+\1/%_lib+g" \
>+    -e  "s+$\${INSTALLTOP}$/lib+\1/%_lib+g" \
>+    -e	"s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/%_lib+g" \
>+	Makefile.org > Makefile.new \
>+	&& diff -u Makefile.org Makefile.new \
>+	|| mv Makefile.new Makefile.org
>+
>+export DSO_SCHEME='dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)'
>+cat <<EOF>>./Configure
>+"linux-x86_64", "gcc:-DL_ENDIAN -DNO_ASM	::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::						$DSO_SCHEME",
>+EOF
>+
>+./config shared -DSSL_ALLOW_ADH --prefix=%prefix --openssldir=%openssldir $ADD_ARGS
> 
> # SMP-incompatible build.
> make Makefile.ssl
>@@ -220,14 +233,14 @@
> %__subst -p 's,%%version,%version,g;s,%%openssldir,%openssldir,g' \
> 	$RPM_BUILD_ROOT%_bindir/%name-config
> 
>-# Relocate shared libraries from %_libdir/ to /lib/.
>-%__mkdir_p $RPM_BUILD_ROOT/lib
>+# Relocate shared libraries from %_libdir/ to /%_lib/.
>+%__mkdir_p $RPM_BUILD_ROOT/%_lib
> for f in $RPM_BUILD_ROOT%_libdir/*.so; do
> 	t=`objdump -p "$f" |%__awk '/SONAME/ {print $2}'`
> 	[ -n "$t" ]
>-	%__ln_s -nf ../../lib/"$t" "$f"
>+	%__ln_s -nf ../../%_lib/"$t" "$f"
> done
>-%__mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/lib/
>+%__mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/%_lib/
> 
> # Relocate %name.cnf from %%openssldir/ to %_sysconfdir/%name/.
> %__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/%name
>@@ -284,7 +297,7 @@
> %endif #compat
> 
> %files -n libssl
>-/lib/*
>+/%_lib/*
> %dir %docdir
> %docdir/[A-Z]*
>

Actions: View | Diff

Attachments on bug 6099: 734