On Tue, Sep 03, 2013 at 11:06:19AM +0100, Stuart Henderson wrote:
> On 2013/09/03 02:09, Juan Francisco Cantero Hurtado wrote:
> > Patch tested on amd64 and arm. All tests passed.
>
> > +# A lot of errors in the compilation of memxor.s
> > +.if ${MACHINE_ARCH} == "arm"
> > +CONFIGURE_ARGS += --disable-assembler
> > +.endif
>
> Maybe "binutils 2.15 can't handle memxor.s" in the comment?
Yes, better. I was not sure if the culprit is our version of binutils or
the code is broken.
>
> > The ggdb3 patch is unrelated to arm errors.
>
> Bump needed for this one.
>
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libnettle/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 9 Jun 2013 14:25:12 -0000 1.10
+++ Makefile 3 Sep 2013 12:31:03 -0000
@@ -3,6 +3,7 @@
COMMENT= cryptographic library
DISTNAME= nettle-2.7.1
+REVISION= 0
PKGNAME= lib${DISTNAME}
SHARED_LIBS += hogweed 1.1 # 2.3
@@ -31,6 +32,11 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
M4=${LOCALBASE}/bin/gm4
+
+# binutils 2.15 can't handle memxor.s
+.if ${MACHINE_ARCH} == "arm"
+CONFIGURE_ARGS += --disable-assembler
+.endif
MAKE_FLAGS= LIBNETTLE_SONAME=libnettle.so.${LIBnettle_VERSION} \
LIBNETTLE_FILE=libnettle.so.${LIBnettle_VERSION} \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/libnettle/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 9 Jun 2013 14:25:12 -0000 1.3
+++ patches/patch-configure 3 Sep 2013 12:31:03 -0000
@@ -2,8 +2,10 @@ $OpenBSD: patch-configure,v 1.3 2013/06/
Fix relocation errors on (at least) sparc64.
+We don't want extra debug flags in regular builds.
+
--- configure.orig Tue May 28 16:21:53 2013
-+++ configure Sun Jun 9 16:11:13 2013
++++ configure Tue Sep 3 00:54:45 2013
@@ -4899,6 +4899,7 @@ else
bsdi4.*) CCPIC="-fPIC" ;;
bsdi*) CCPIC="" ;;
@@ -12,3 +14,12 @@ Fix relocation errors on (at least) spar
# Could also use -fpic, depending on the number of symbol references
solaris*) CCPIC="-fPIC" ;;
cygwin*) CCPIC="" ;;
+@@ -7341,7 +7342,7 @@ if test x$GCC = xyes ; then
+ if $CC --version | grep '^2\.96$' 1>/dev/null 2>&1; then
+ true
+ else
+- CFLAGS="$CFLAGS -ggdb3"
++ CFLAGS="$CFLAGS"
+ fi
+ # FIXME: It would be better to actually test if this option works and/or is
needed.
+ # Or perhaps use -funsigned-char.
