Date: Tue, 25 Jul 2023 09:42:29 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e624acf53d68 - main - x11-wm/jewel: Fix build with llvm16 Message-ID: <202307250942.36P9gTgN069754@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e624acf53d68aabc52bbdb81ba0c9f7b63ac645b commit e624acf53d68aabc52bbdb81ba0c9f7b63ac645b Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-07-25 08:44:09 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-07-25 09:42:18 +0000 x11-wm/jewel: Fix build with llvm16 - Pet portclippy Sponsored by: The FreeBSD Foundation --- x11-wm/jewel/Makefile | 7 +++++-- x11-wm/jewel/files/patch-goodies-fspanel_Makefile | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile index 01c1b18cb745..5d2e9081de99 100644 --- a/x11-wm/jewel/Makefile +++ b/x11-wm/jewel/Makefile @@ -12,14 +12,17 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler gmake xorg +USE_CXXSTD= c++14 USE_XORG= x11 xext xpm -ALL_TARGET= all -PORTDOCS= Changelog Changelog.DLR Changelog.jewel INSTALL README + MAKE_ARGS= CFLAGS="${CXXFLAGS}" +ALL_TARGET= all CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing +PORTDOCS= Changelog Changelog.DLR Changelog.jewel INSTALL README + OPTIONS_DEFINE= DOCS post-patch: diff --git a/x11-wm/jewel/files/patch-goodies-fspanel_Makefile b/x11-wm/jewel/files/patch-goodies-fspanel_Makefile index 0ad2306dfed3..3a1aa220fa77 100644 --- a/x11-wm/jewel/files/patch-goodies-fspanel_Makefile +++ b/x11-wm/jewel/files/patch-goodies-fspanel_Makefile @@ -4,10 +4,10 @@ -CC = gcc -C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -m386 -malign-loops=2 -malign-jumps=2 -malign-functions=2 +CC ?= gcc -+C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-functions=2 ++C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-functions=2 --std=c++14 L_FLAGS = -O1 -Xlinker -s -L$(XROOT)/lib -lX11 -lXpm PROGNAME = fspanel - + +all: $(PROGNAME) + $(PROGNAME): Makefile fspanel.c fspanel.h icon.xpm @@ -15,7 +15,7 @@ @ls -l $(PROGNAME) @@ -14,4 +16,4 @@ cp -r $(PROGNAME) $(DESTDIR)$(prefix)/bin - + uninstall: - rm $(DESTDIR)$(prefix)/bin/$(PROGNAME) \ No newline at end of file
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307250942.36P9gTgN069754>