Date: Wed, 21 Feb 2024 11:46:47 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 795ec16dba50 - main - devel/mold: Remove the patch which was missed Message-ID: <202402211146.41LBklgs047111@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=795ec16dba505f67538025b33fc51427cff6c927 commit 795ec16dba505f67538025b33fc51427cff6c927 Author: Ashish SHUKLA <ashish@FreeBSD.org> AuthorDate: 2024-02-21 11:44:33 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2024-02-21 11:44:33 +0000 devel/mold: Remove the patch which was missed In the last commit to this port, I missed removing the patch which was failing to apply, there by causing the build to be broken. Sorry about this. Reported by: pkg-fallout --- devel/mold/files/patch-Makefile | 44 ----------------------------------------- 1 file changed, 44 deletions(-) diff --git a/devel/mold/files/patch-Makefile b/devel/mold/files/patch-Makefile deleted file mode 100644 index 0721117616fd..000000000000 --- a/devel/mold/files/patch-Makefile +++ /dev/null @@ -1,44 +0,0 @@ ---- Makefile.orig 2022-04-28 09:51:29 UTC -+++ Makefile -@@ -4,7 +4,7 @@ - - VERSION = 1.2.1 - --PREFIX = /usr/local -+PREFIX = %%PREFIX%% - BINDIR = $(PREFIX)/bin - LIBDIR = $(PREFIX)/lib - LIBEXECDIR = $(PREFIX)/libexec -@@ -27,7 +27,7 @@ PKG_CONFIG = pkg-config - - # If you want to keep symbols in the installed binary, run make with - # `STRIP=true` to run /bin/true instead of the strip command. --STRIP = strip -+STRIP = $(STRIP_CMD) - - SRCS = $(wildcard *.cc elf/*.cc macho/*.cc) - OBJS = $(SRCS:%.cc=out/%.o) -@@ -103,8 +103,8 @@ ifneq ($(OS), Darwin) - endif - - ifeq ($(NEEDS_LIBCRYPTO), 1) -- MOLD_CXXFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I openssl) -- MOLD_LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L openssl) -lcrypto -+ MOLD_CXXFLAGS += -I${OPENSSLINC} -+ MOLD_LDFLAGS += -L${OPENSSLLIB} -lcrypto - endif - - # '-latomic' flag is needed building on riscv64 system -@@ -205,11 +205,7 @@ install: all - - $(INSTALL) -d $D$(LIBEXECDIR)/mold - --# We want to make a symblink with a relative path, so that users can --# move the entire directory to other place without breaking the reference. --# GNU ln supports `--relative` to do that, but that's not supported by --# non-GNU systems. So we use Python to compute a relative path. -- ln -sf `python3 -c "import os.path; print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` $D$(LIBEXECDIR)/mold/ld -+ ln -sf ../../bin/mold $D$(LIBEXECDIR)/mold/ld - - $(INSTALL) -d $D$(MANDIR)/man1 - $(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402211146.41LBklgs047111>