* GNU autoconf documentation says we should use $host instead of $target if we're not building a compiler. It turns out that RPM seems to have a different interpretation of that. Reverting to the previous behavior.
* Don't touch CFLAGS based on the $target_cpu when ./configure'ing, as it should already contain everything necessary from the configure script command line or environment. Signed-off-by: Klaus Heinrich Kiwi <[email protected]> --- configure.in | 11 +---------- usr/lib/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index 1ab980b..be3c202 100644 --- a/configure.in +++ b/configure.in @@ -9,7 +9,7 @@ cmdline_CFLAGS="$CFLAGS" AM_INIT_AUTOMAKE([foreign 1.6]) dnl Get the canonical host type -AC_CANONICAL_HOST +AC_CANONICAL_TARGET dnl Checks for header files. AC_DISABLE_STATIC @@ -41,15 +41,6 @@ AC_PATH_PROG([CHGRP], [chgrp], [/bin/chgrp]) AC_PROG_SED AC_PROG_MKDIR_P -case $host_cpu in - x86_64 | ppc64* | s390x) - CFLAGS="-m64 $cmdline_CFLAGS" - ;; - *) - CFLAGS="-m32 $cmdline_CFLAGS" - ;; -esac - dnl --- dnl --- Check all --enable/--disable-features dnl --- diff --git a/usr/lib/Makefile.am b/usr/lib/Makefile.am index a76e7a9..754668d 100644 --- a/usr/lib/Makefile.am +++ b/usr/lib/Makefile.am @@ -3,8 +3,8 @@ SUBDIRS = pkcs11 install-data-hook: $(MKDIR_P) $(DESTDIR)/etc/ld.so.conf.d echo "$(libdir)/opencryptoki" >\ - $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(host_cpu).conf + $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf echo "$(libdir)/opencryptoki/stdll" >>\ - $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(host_cpu).conf + $(DESTDIR)/etc/ld.so.conf.d/opencryptoki-$(target_cpu).conf echo "**** Remember you must run ldconfig before using the above settings ****" -- 1.7.1.1 ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
