-
Notifications
You must be signed in to change notification settings - Fork 747
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
deforaos-browser: avoid conflicts with other packages #288
base: main
Are you sure you want to change the base?
Conversation
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_BROWSER=\\\"deforaos-browser\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_COPY=\\\"deforaos-copy\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_DESKTOP=\\\"deforaos-desktop\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_DESKTOPCTL=\\\"deforaos-desktopctl\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_MOVE=\\\"deforaos-move\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_OPEN=\\\"deforaos-open\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_PROPERTIES=\\\"deforaos-properties\\\" | ||
MAKE_ARGS+= CPPFLAGS+=-DPROGNAME_VIEW=\\\"deforaos-view\\\" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can set CPPFLAGS
directly.
MAKE_ARGS+= PREFIX=${PREFIX}
MAKE_ENV+= MANDIR=${STAGEDIR}${PREFIX}/share/man
CPPFLAGS= -DPROGNAME_BROWSER=deforaos-browser \
-DPROGNAME_COPY=deforaos-copy \
-DPROGNAME_DESKTOP=deforaos-desktop \
-DPROGNAME_DESKTOPCTL=deforaos-desktopctl \
-DPROGNAME_MOVE=deforaos-move \
-DPROGNAME_OPEN=deforaos-open \
-DPROGNAME_PROPERTIES=deforaos-properties \
-DPROGNAME_VIEW=deforaos-view
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, this only works if HAS_CONFIGURE
is set, and this software does not use GNU configure.
Mk/bsd.port.mk:
2039 MAKE_ENV+= PREFIX=${PREFIX} \
2040 LOCALBASE=${LOCALBASE} \
2041 CC="${CC}" CFLAGS="${CFLAGS}" \
2042 CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
2043 LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
2044 CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
But the Makefiles from DeforaOS ignore the environment. (They set CPPFLAGS=...
in order to avoid surprises)
Mk/bsd.port.mk:
3316 . if defined(HAS_CONFIGURE)
[...]
3320 if ! ${SETENVI} ${WRK_ENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
3321 CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
3322 LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
[...]
3328 ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; then \
3329 ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
3330 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \
3331 ${FALSE}; \
3332 fi)
3333 . endif
Prefix the installed binaries with "deforaos-" to avoid conflicts with other packages, such as sysutils/schilyutils and science/silo. Sponsored by: The FreeBSD Foundation Pull Request: freebsd#288
da3c84c
to
f961383
Compare
Prefix the installed binaries with "deforaos-" to avoid conflicts with other packages, such as sysutils/schilyutils and science/silo. Sponsored by: The FreeBSD Foundation Pull Request: freebsd#288
f961383
to
458fb35
Compare
The binaries installed by the port in /usr/local/bin were prefixed with "deforaos-" to avoid installing files conflicting with other packages, such as sysutils/schilyutils and science/silo.