tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] fix devel/ncurses and editors/nano to use pkgsrc's ncurses



Hi,

here are two patches I recently needed to build nano on an SLES 11.4
system. I am not sure why it was not required on CentOS 7. Both base
systems feature ncursesw 5.x, while pkgsrc installs 6.0. The nano build
finds ncursesw5-config from the host system and then fails to build
with ncurses header confusion. The patch fixes it to look for
ncursesw6-config if the pkgsrc one is to be used. This of course won't
help you if you got ncurses 6 in the system and want to use that, but
it does the trick here.

Looking at a complaint from `ncursesw6-config --libs` pointed me to a
substitution in devel/ncurses/Makefile.common being broken. It turned

	LIBDIR=-L$libdir

into

	LIBDIR=-Wl,-R$libdir -L$libdir

… and thus the shell complains that it cannot find the program
indicated by -L$libdir. Nasty girl, put some quotes on.

Both patches are against current CVS, although I worked with 2017Q1.

Please apply.


Alrighty then,

Thomas

PS: I still got some dozen patches lying around … not sure what happened
to the ones I posted here some months ago.

-- 
Dr. Thomas Orgis
Universität Hamburg
RRZ / Basis-Infrastruktur / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270
Index: devel/ncurses/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ncurses/Makefile.common,v
retrieving revision 1.34
diff -u -r1.34 Makefile.common
--- devel/ncurses/Makefile.common	19 Jan 2017 18:52:07 -0000	1.34
+++ devel/ncurses/Makefile.common	7 Jul 2017 15:09:51 -0000
@@ -33,7 +33,7 @@
 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"
Index: editors/nano/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/nano/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- editors/nano/Makefile	3 Jul 2017 12:12:30 -0000	1.63
+++ editors/nano/Makefile	7 Jul 2017 15:10:34 -0000
@@ -33,6 +33,14 @@
 INSTALLATION_DIRS+=	share/examples/nano
 CONF_FILES+=		share/examples/nano/nanorc ${PKG_SYSCONFDIR}/nanorc
 
+.if empty(USE_BUILTIN.ncursesw:Myes)
+SUBST_CLASSES+=         ncursesw
+SUBST_FILES.ncursesw+=  configure
+SUBST_STAGE.ncursesw=   pre-configure
+SUBST_SED.ncursesw+=    -e s:ncursesw5-config:ncursesw6-config:g
+SUBST_MESSAGE.ncursesw= Making configure look for ncursesw6-config.
+.endif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.nanorc ${DESTDIR}${PREFIX}/share/examples/nano/nanorc
 

Attachment: smime.p7s
Description: S/MIME cryptographic signature



Home | Main Index | Thread Index | Old Index