浏览代码

openssl: fix compilation for i386

Closes #3445.

OpenSSL emits bswap instructions when building for i386 targets which
unfortunately is only available on 486+ class processors.
Since the normal workaround is detected at build time and we are cross
compiling we need to specify this.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Gustavo Zacarias 14 年之前
父节点
当前提交
47736c88c3
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 4 3
      CHANGES
  2. 5 0
      package/openssl/openssl.mk

+ 4 - 3
CHANGES

@@ -4,12 +4,13 @@
 	avahi, busybox, dnsmasq, dropbear, ethtool, fakeroot, ffmpeg,
 	file, gnuconfig, gst-ffmpeg, gst-plugins-good, icu,
 	imagemagick, libdnet, libpng, libxml2, libxslt, makedevs,
-	mpg123, mtd-utils, ncurses, netsnmp, pkg-config, qt, samba,
-	socat, squashfs, webkit, xerces, xlib_xtrans, xorg-server,
-	xterm, xz
+	mpg123, mtd-utils, ncurses, netsnmp, openssl, pkg-config, qt,
+	samba, socat, squashfs, webkit, xerces, xlib_xtrans,
+	xorg-server, xterm, xz
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#3445: Not working openssl-10.0.0d on 386sx
 	#3451: fakeroot package: wrong FAKEROOT_SITE variable
 	#3457: alsamixergui: broken URL
 	#3475: Calling sync on large filesystems when not always necessary

+ 5 - 0
package/openssl/openssl.mk

@@ -39,6 +39,11 @@ ifeq ($(ARCH),x86_64)
 	OPENSSL_TARGET_ARCH = x86_64
 endif
 
+# Workaround for bug #3445
+ifeq ($(BR2_x86_i386),y)
+	OPENSSL_TARGET_ARCH = generic32 386
+endif
+
 define OPENSSL_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_ARGS) \