On Sun, Apr 12 2020, Charlene Wendling <[email protected]> wrote:
> Hi,
>
> gnupg is broken in the current macppc bulk for two reasons:

duh, why am I maintaining this already? :)

>> error: invalid use of a cast in an inline asm context requiring an
>> l-value
>
> This needs `-fheinous-gnu-extensions' as seen on other archs.
>
>> error: unsupported argument '-mppc' to option 'Wa,'
>
> The integrated assembler being unhappy with that flag, i disabled it.
>
> The below diff fixes the build [0] on macppc, and tests pass. No
> REVISION bump needed, because we've never shipped packages with
> '_SYSTEM_VERSION-powerpc=1'.
>
> Comments/feedback are welcome,
>
> Charlène.
>
>
> [0] https://bin.charlenew.xyz/macppc/paths/security/gnupg.log
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/gnupg/Makefile,v
> retrieving revision 1.115
> diff -u -p -u -p -r1.115 Makefile
> --- Makefile  12 Jul 2019 02:16:23 -0000      1.115
> +++ Makefile  12 Apr 2020 13:02:21 -0000
> @@ -56,7 +56,8 @@ GNUPGDOCFILES=      README AUTHORS COPYING TH
>  
>  .include <bsd.port.arch.mk>
>  .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "mips64" || \
> -     ${MACHINE_ARCH} == "mips64el") && ${PROPERTIES:Mclang}
> +     ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "powerpc") \
> +     && ${PROPERTIES:Mclang}
>  CFLAGS += -fheinous-gnu-extensions
>  .endif
>  
> @@ -64,6 +65,11 @@ CFLAGS += -fheinous-gnu-extensions
>  pre-configure:
>       # mpi/hppa1.1/udiv-qrnnd.S is not PIE-safe
>       mv ${WRKSRC}/mpi/hppa/udiv-qrnnd.S ${WRKSRC}/mpi/hppa1.1/
> +.endif
> +
> +# Fix "error: unsupported argument '-mppc' to option 'Wa,'"
> +.if ${MACHINE_ARCH} == "powerpc"
> +CFLAGS+=     -no-integrated-as
>  .endif

clang seems happy with -no-integrated-as but I'd
suggest -fno-integrated-as which looks more like other options.
ok jca@ either way.

See the diff below if you want to give it a shot.  I hope I'll solve
this post 6.7 by removing security/gnupg.


Index: patches/patch-mpi_config_links
===================================================================
RCS file: patches/patch-mpi_config_links
diff -N patches/patch-mpi_config_links
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-mpi_config_links      12 Apr 2020 16:59:57 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: mpi/config.links
+--- mpi/config.links.orig
++++ mpi/config.links
+@@ -234,7 +234,6 @@ case "${host}" in
+        echo '/* configured for {Open,Net}BSD on powerpc */' 
>>./mpi/asm-syntax.h
+        echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
+        cat   $srcdir/mpi/powerpc32/syntax.h    >>./mpi/asm-syntax.h
+-       mpi_sflags="-Wa,-mppc"
+        path="powerpc32"
+        ;;
+ 

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to