Page MenuHomeFreeBSD
Differential D16813 Diff 46975 archivers/p7zip/Makefile

Changeset View

Standalone View

View Options

archivers/p7zip/Makefile

Show All 19 Lines
MAKE_ARGS= OPTFLAGS="${CXXFLAGS}" MAKE_ARGS= OPTFLAGS="${CXXFLAGS}"
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
CFLAGS_arm= -fPIC CFLAGS_arm= -fPIC
CFLAGS_armv6= -fPIC CFLAGS_armv6= -fPIC
CFLAGS_armv7= -fPIC CFLAGS_armv7= -fPIC
CFLAGS_aarch64= -fPIC CFLAGS_aarch64= -fPIC
CFLAGS_amd64= -fPIC CFLAGS_amd64= -fPIC
CFLAGS_i386= -fPIC
CFLAGS_powerpc= -fPIC CFLAGS_powerpc= -fPIC
CFLAGS_sparc64= -fPIC CFLAGS_sparc64= -fPIC
.if ${ARCH} == "i386"
# Fix the build for i386 when WITH_LLD_IS_LD is set
# https://bugs.freebsd.org/230210
LDFLAGS+=-Wl,-z,notext
.endif
tobikUnsubmitted
Done
Inline Actions

This needs to happen after including bsd.ports.{options,pre}.mk as ARCH is not yet defined at this point, so it cannot be used in an .if as that forces evaluation of it too early:

make: "/usr/ports/archivers/p7zip/Makefile" line 32: Malformed conditional (${ARCH} == "i386")
make: Fatal errors encountered -- cannot continue
make: stopped in /usr/ports/archivers/p7zip

Why not instead use

# Fix the build for i386 when WITH_LLD_IS_LD is set
# https://bugs.freebsd.org/230210
LDFLAGS+=	${LDFLAGS_${ARCH}}
LDFLAGS_i386=	-Wl,-z,notext
tobik: This needs to happen after including bsd.ports.{options,pre}.mk as ARCH is not yet defined at…
mmokhiAuthorUnsubmitted
Done
Inline Actions

Ah actually I wanted to use LDFLAGS_i386 construct initially (for the sake of simplicity and similarity to `CFLAGS_i386, but I couldn't find anything about it in handbook.
Yup, I'm gonna change it in the way you suggested 😊
Thanks 👍 🙏

mmokhi: Ah actually I wanted to use `LDFLAGS_i386` construct initially (for the sake of simplicity and…
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
PORTDOCS= * PORTDOCS= *
post-patch: post-patch:
${SED} -e 's!g\+\+!${CXX}!' \ ${SED} -e 's!g\+\+!${CXX}!' \
-e 's!gcc!${CC}!' \ -e 's!gcc!${CC}!' \
Show All 29 Lines