Hi,

In the current macppc bulk, sogo is broken with:

> cc: error: unknown argument: '-ftrampolines'

This is a leftover of the base-gcc era. It only appears now because
this is the first time i'm performing a bulk with base-clang and a
working GNUstep.

Removing the old workaround fixes the build [0]. I added a REVISION
bump for safety (i don't think it has ever been built with
the current _SYSTEM_VERSION-powerpc number).

Comments/feedback are welcome,

Charlène.


[0] https://bin.charlenew.xyz/sogo.log


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 Makefile
--- Makefile    5 Nov 2020 08:30:35 -0000       1.91
+++ Makefile    11 Dec 2020 17:03:54 -0000
@@ -3,6 +3,7 @@
 COMMENT =      web based groupware server
 
 VERSION =      5.0.1
+REVISION =     0
 DISTNAME =     SOGo-${VERSION}
 PKGNAME =      sogo-${VERSION}
 
@@ -36,10 +37,6 @@ LIB_DEPENDS +=               archivers/libzip \
                        www/sope>=${VERSION}
 RUN_DEPENDS +=         sope-postgres-*|sope-mysql-*:www/sope,-postgres \
                        archivers/zip
-
-.if ${MACHINE_ARCH} == "powerpc"
-PATCH_LIST =           patch-* gcc-*
-.endif
 
 CONFIGURE_STYLE =      simple dest
 CONFIGURE_ARGS +=      --gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
Index: patches/gcc-patch-SoObjects_Appointments_GNUmakefile
===================================================================
RCS file: patches/gcc-patch-SoObjects_Appointments_GNUmakefile
diff -N patches/gcc-patch-SoObjects_Appointments_GNUmakefile
--- patches/gcc-patch-SoObjects_Appointments_GNUmakefile        8 Jan 2014 
20:28:54 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: gcc-patch-SoObjects_Appointments_GNUmakefile,v 1.1 2014/01/08 
20:28:54 brad Exp $
---- SoObjects/Appointments/GNUmakefile.orig    Wed Jul 25 22:27:42 2012
-+++ SoObjects/Appointments/GNUmakefile Sat Aug 18 14:44:00 2012
-@@ -59,6 +59,7 @@ Appointments_LOCALIZED_RESOURCE_FILES = Localizable.st
- 
- ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
- ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-+ADDITIONAL_OBJCFLAGS += -ftrampolines
- ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lcurl
- 
- -include GNUmakefile.preamble

Reply via email to