Honor LDFLAGS to support RELROdiff -r1.2 -r1.3 pkgsrc/filesystems/fuse-sparsebundlefs/Makefile
(pho)
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2018/07/18 00:06:15 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2021/12/02 12:02:05 pho Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= fuse-sparsebundlefs-20160928 | 4 | DISTNAME= fuse-sparsebundlefs-20160928 | |
5 | CATEGORIES= filesystems | 5 | CATEGORIES= filesystems | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=torarnv/} | 6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=torarnv/} | |
7 | GITHUB_PROJECT= sparsebundlefs | 7 | GITHUB_PROJECT= sparsebundlefs | |
8 | GITHUB_TAG= f3ccd20bd6393b05c9949810feb0e0b366b86348 | 8 | GITHUB_TAG= f3ccd20bd6393b05c9949810feb0e0b366b86348 | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= https://github.com/torarnv/sparsebundlefs | 11 | HOMEPAGE= https://github.com/torarnv/sparsebundlefs | |
12 | COMMENT= FUSE filesystem for reading Mac OS sparse-bundle disk images. | 12 | COMMENT= FUSE filesystem for reading Mac OS sparse-bundle disk images | |
13 | LICENSE= 2-clause-bsd | 13 | LICENSE= 2-clause-bsd | |
14 | 14 | |||
15 | USE_LANGUAGES= c c++03 | 15 | USE_LANGUAGES= c c++03 | |
16 | USE_TOOLS+= gmake pkg-config | 16 | USE_TOOLS+= gmake pkg-config | |
17 | 17 | |||
18 | INSTALLATION_DIRS= bin | 18 | INSTALLATION_DIRS= bin | |
19 | 19 | |||
20 | do-install: | 20 | do-install: | |
21 | ${INSTALL_PROGRAM} ${WRKSRC}/sparsebundlefs ${DESTDIR}/${PREFIX}/bin/ | 21 | ${INSTALL_PROGRAM} ${WRKSRC}/sparsebundlefs ${DESTDIR}/${PREFIX}/bin/ | |
22 | 22 | |||
23 | .include "../../mk/fuse.buildlink3.mk" | 23 | .include "../../mk/fuse.buildlink3.mk" | |
24 | .include "../../mk/bsd.pkg.mk" | 24 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2021/10/26 10:25:28 nia Exp $ | 1 | $NetBSD: distinfo,v 1.4 2021/12/02 12:02:05 pho Exp $ | |
2 | 2 | |||
3 | BLAKE2s (fuse-sparsebundlefs-20160928-f3ccd20bd6393b05c9949810feb0e0b366b86348.tar.gz) = 87934e8e8f574e12da209c835c50259ca4a217208da894792fbf48d81a699c3d | 3 | BLAKE2s (fuse-sparsebundlefs-20160928-f3ccd20bd6393b05c9949810feb0e0b366b86348.tar.gz) = 87934e8e8f574e12da209c835c50259ca4a217208da894792fbf48d81a699c3d | |
4 | SHA512 (fuse-sparsebundlefs-20160928-f3ccd20bd6393b05c9949810feb0e0b366b86348.tar.gz) = df0cc02f7dba0fc5b534004b3fe322d36cd03bacb42bbc7564b8f29f910773b16a861e965f1834447341f642d16a9379bcd8468bdcf389f17cf27f6bccb61dbd | 4 | SHA512 (fuse-sparsebundlefs-20160928-f3ccd20bd6393b05c9949810feb0e0b366b86348.tar.gz) = df0cc02f7dba0fc5b534004b3fe322d36cd03bacb42bbc7564b8f29f910773b16a861e965f1834447341f642d16a9379bcd8468bdcf389f17cf27f6bccb61dbd | |
5 | Size (fuse-sparsebundlefs-20160928-f3ccd20bd6393b05c9949810feb0e0b366b86348.tar.gz) = 8070 bytes | 5 | Size (fuse-sparsebundlefs-20160928-f3ccd20bd6393b05c9949810feb0e0b366b86348.tar.gz) = 8070 bytes | |
6 | SHA1 (patch-Makefile) = 5a7ae0323fdfdc6e3c117e97ea5734074c10adae | 6 | SHA1 (patch-Makefile) = 376e8945efa26823a147a292ef9a620a47653197 |
@@ -1,24 +1,35 @@ | @@ -1,24 +1,35 @@ | |||
1 | $NetBSD: patch-Makefile,v 1.1 2016/10/02 16:33:28 bouyer Exp $ | 1 | $NetBSD: patch-Makefile,v 1.2 2021/12/02 12:02:05 pho Exp $ | |
2 | 2 | |||
3 | --- Makefile.orig 2016-09-27 23:50:42.000000000 +0200 | 3 | Honor LDFLAGS to support RELRO. | |
4 | +++ Makefile 2016-10-02 18:19:10.000000000 +0200 | 4 | ||
5 | @@ -3,14 +3,14 @@ | 5 | --- Makefile.orig 2016-09-27 21:50:42.000000000 +0000 | |
6 | +++ Makefile | |||
7 | @@ -3,14 +3,14 @@ TARGET = sparsebundlefs | |||
6 | PKG_CONFIG = pkg-config | 8 | PKG_CONFIG = pkg-config | |
7 | override CFLAGS += -Wall -O2 -g | 9 | override CFLAGS += -Wall -O2 -g | |
8 | 10 | |||
9 | -GCC_4_2_OR_HIGHER := $(shell expr `$(CXX) -dumpversion | sed 's/\.//g'` \>= 420) | 11 | -GCC_4_2_OR_HIGHER := $(shell expr `$(CXX) -dumpversion | sed 's/\.//g'` \>= 420) | |
10 | -ifeq "$(GCC_4_2_OR_HIGHER)" "1" | 12 | -ifeq "$(GCC_4_2_OR_HIGHER)" "1" | |
11 | - CFLAGS += -march=native | 13 | - CFLAGS += -march=native | |
12 | -endif | 14 | -endif | |
13 | - | 15 | - | |
14 | DEFINES = -DFUSE_USE_VERSION=26 | 16 | DEFINES = -DFUSE_USE_VERSION=26 | |
15 | 17 | |||
16 | ifeq ($(shell uname), Darwin) | 18 | ifeq ($(shell uname), Darwin) | |
17 | + GCC_4_2_OR_HIGHER := $(shell expr `$(CXX) -dumpversion | sed 's/\.//g'` \>= 420) | 19 | + GCC_4_2_OR_HIGHER := $(shell expr `$(CXX) -dumpversion | sed 's/\.//g'` \>= 420) | |
18 | + ifeq "$(GCC_4_2_OR_HIGHER)" "1" | 20 | + ifeq "$(GCC_4_2_OR_HIGHER)" "1" | |
19 | + CFLAGS += -march=native | 21 | + CFLAGS += -march=native | |
20 | + endif | 22 | + endif | |
21 | + | 23 | + | |
22 | # Pick up OSXFUSE, even with pkg-config from MacPorts | 24 | # Pick up OSXFUSE, even with pkg-config from MacPorts | |
23 | PKG_CONFIG := PKG_CONFIG_PATH=/usr/local/lib/pkgconfig $(PKG_CONFIG) | 25 | PKG_CONFIG := PKG_CONFIG_PATH=/usr/local/lib/pkgconfig $(PKG_CONFIG) | |
24 | else ifeq ($(shell uname), Linux) | 26 | else ifeq ($(shell uname), Linux) | |
27 | @@ -20,7 +20,7 @@ endif | |||
28 | FUSE_FLAGS := $(shell $(PKG_CONFIG) fuse --cflags --libs) | |||
29 | ||||
30 | $(TARGET): sparsebundlefs.cpp | |||
31 | - $(CXX) $< -o $@ $(CFLAGS) $(FUSE_FLAGS) $(LFLAGS) $(DEFINES) | |||
32 | + $(CXX) $< -o $@ $(CFLAGS) $(FUSE_FLAGS) $(LFLAGS) $(LDFLAGS) $(DEFINES) | |||
33 | ||||
34 | all: $(TARGET) | |||
35 |