svn commit: r546699 - in head: audio/gtkpod emulators/almostti/files
Alexey Dokuchaev
danfe at FreeBSD.org
Fri Aug 28 02:39:39 UTC 2020
Author: danfe
Date: Fri Aug 28 02:39:38 2020
New Revision: 546699
URL: https://svnweb.freebsd.org/changeset/ports/546699
Log:
Unbreak the build with -fno-common (Clang 11, GCC 10).
Reported by: pkg-fallout
Modified:
head/audio/gtkpod/Makefile
head/emulators/almostti/files/patch-EMULib_Rules.Unix
Modified: head/audio/gtkpod/Makefile
==============================================================================
--- head/audio/gtkpod/Makefile Fri Aug 28 00:04:01 2020 (r546698)
+++ head/audio/gtkpod/Makefile Fri Aug 28 02:39:38 2020 (r546699)
@@ -51,6 +51,12 @@ post-patch:
# Fix location of the <endian.h> header
@${REINPLACE_CMD} -e 's|endian\.h|sys/&|' ${WRKSRC}/configure \
${WRKSRC}/src/mp4file.c
+# Fix the build with -fno-common (for Clang 11 and GCC 10)
+ @${REINPLACE_CMD} -e '/main_window_xml/s|^|extern |' \
+ ${WRKSRC}/src/display.h
+ @${REINPLACE_CMD} -e '51s|^|GladeXML *main_window_xml;|' \
+ ${WRKSRC}/src/display.c
+ @${REINPLACE_CMD} -e 's|} CONF_ID|}|' ${WRKSRC}/src/confirmation.h
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Modified: head/emulators/almostti/files/patch-EMULib_Rules.Unix
==============================================================================
--- head/emulators/almostti/files/patch-EMULib_Rules.Unix Fri Aug 28 00:04:01 2020 (r546698)
+++ head/emulators/almostti/files/patch-EMULib_Rules.Unix Fri Aug 28 02:39:38 2020 (r546699)
@@ -5,7 +5,7 @@
include ../../EMULib/Rules.gcc
-CFLAGS += -I$(EMULIB)/Unix -I/usr/X11R6/include
-+CFLAGS += -I$(EMULIB)/Unix -I$(LOCALBASE)/include
++CFLAGS += -fcommon -I$(EMULIB)/Unix -I$(LOCALBASE)/include
DEFINES+= -DUNIX -DMITSHM -DBPS16
-LIBS += -lX11 -lXext
+LIBS += -L$(LOCALBASE)/lib -lX11 -lXext
More information about the svn-ports-all
mailing list