pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cataclysm-dda: work around build problem for ncursesw6-config
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Fri Dec 25 21:28:21 2015 +0200
Changeset: 7e8d6e67bad38274dd4187dd639363ac35d9ef18
Modified Files:
cataclysm-dda/Makefile
Log Message:
cataclysm-dda: work around build problem for ncursesw6-config
Note that devel/ncurses still needs something like:
--- devel/ncurses/Makefile.common.orig 2015-11-07 18:50:23.000000000 +0000
+++ devel/ncurses/Makefile.common
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --includedir=${PREFIX}/
SUBST_CLASSES+= rpath
SUBST_FILES.rpath+= misc/ncurses-config
SUBST_STAGE.rpath= post-configure
-SUBST_SED.rpath+= -e "s|-L\\(.libdir\\)|${COMPILER_RPATH_FLAG}\\1 -L\\1|"
+SUBST_SED.rpath+= -e "s|-L\\(.libdir\\)|\"${COMPILER_RPATH_FLAG}\\1 -L\\1\"|"
SUBST_MESSAGE.rpath= Fixing rpath in ncurses-config.
.include "../../mk/bsd.prefs.mk"
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7e8d6e67bad38274dd4187dd639363ac35d9ef18
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cataclysm-dda/Makefile | 7 +++++++
1 file changed, 7 insertions(+)
diffs:
diff --git a/cataclysm-dda/Makefile b/cataclysm-dda/Makefile
index d3a106f..478daa4 100644
--- a/cataclysm-dda/Makefile
+++ b/cataclysm-dda/Makefile
@@ -23,6 +23,13 @@ LDFLAGS+= ${BUILDLINK_LDADD.gettext}
REPLACE_SH+= lang/compile_mo.sh
+
+SUBST_CLASSES+= fix-ncurses
+SUBST_STAGE.fix-ncurses= pre-configure
+SUBST_MESSAGE.fix-ncurses= Fixing ncurses configuration.
+SUBST_FILES.fix-ncurses= Makefile
+SUBST_SED.fix-ncurses= -e 's,ncursesw5-config,ncursesw6-config,g'
+
BUILD_MAKE_FLAGS+= DYNAMIC_LINKING=1 RELEASE=1 USE_HOME_DIR=1
BUILD_MAKE_FLAGS+= PREFIX=${PREFIX}
INSTALL_MAKE_FLAGS+= DYNAMIC_LINKING=1 RELEASE=1 USE_HOME_DIR=1
Home |
Main Index |
Thread Index |
Old Index