pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sc-im: Use dlopen.buildlink.mk
Module Name: pkgsrc-wip
Committed By: Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By: sjmulder
Date: Wed Dec 12 02:32:26 2018 +0100
Changeset: 00b99b580285a5357a062cf2f1a735880ab8897b
Modified Files:
sc-im/Makefile
sc-im/TODO
Removed Files:
sc-im/patches/patch-src_Makefile
Log Message:
sc-im: Use dlopen.buildlink.mk
..instead of removing -dl everywhere, potentially brekaing things.
Plus:
- whitespace changes
- not Void Linux (musl-libc) build failure in TODO
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=00b99b580285a5357a062cf2f1a735880ab8897b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sc-im/Makefile | 6 ++++++
sc-im/TODO | 14 ++++++++++++--
sc-im/patches/patch-src_Makefile | 15 ---------------
3 files changed, 18 insertions(+), 17 deletions(-)
diffs:
diff --git a/sc-im/Makefile b/sc-im/Makefile
index c576c2135b..5dc44cfedd 100644
--- a/sc-im/Makefile
+++ b/sc-im/Makefile
@@ -17,14 +17,20 @@ INSTALL_DIRS= src
# pkg-config to avoid broken Makefile self-configuration
USE_TOOLS+= gmake pkg-config yacc
+
# gnuplot is invoked through the shell, no need to check at compile time
CFLAGS+= -DGNUPLOT
+
# defaults to sc-im
MAKE_FLAGS+= name=sc-im
MAKE_FLAGS+= prefix=${PREFIX}
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1
+# replace hardcoded -ldl with whatever dlopen.buildlink3.mk gives us
+BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+
.include "options.mk"
.include "../../devel/ncursesw/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sc-im/TODO b/sc-im/TODO
index 3bd7fcdcbb..1b25b04360 100644
--- a/sc-im/TODO
+++ b/sc-im/TODO
@@ -1,2 +1,12 @@
-- xlsx export (requires libxlsexport package)
-- xls option (requires xlsreader package)
+lua options breaks the build on Void Linux (musl-libc):
+
+ cc -L/usr/pkg/lib -Wl,-R/usr/pkg/lib xlsx.o cmds_edit.o cmds_visual.o
+ history.o marks.o lex.o trigger.o maps.o color.o input.o range.o
+ pipe.o dep_graph.o xls.o buffer.o help.o filter.o format.o undo.o
+ interp.o hide_show.o lua.o file.o plot.o vmtbl.o cmds_insert.o
+ freeze.o block.o tui.o conf.o cmds_normal.o xmalloc.o sort.o main.o
+ cmds.o shift.o cmds_command.o yank.o exec.o clipboard.o subtotal.o
+ utils/extra.o utils/dictionary.o utils/string.o gram.o -o sc-im -lm
+ -pthread -ldl -L/usr/pkg/lib -lncursesw -Wl,-R/usr/pkg/lib
+ -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -llua5.1 -lm -Wl,--export-dynamic
+ /usr/bin/ld: cannot find -l__nonexistent__
diff --git a/sc-im/patches/patch-src_Makefile b/sc-im/patches/patch-src_Makefile
deleted file mode 100644
index fbf42e4a21..0000000000
--- a/sc-im/patches/patch-src_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-NetBSD does not need -ldl. Actually the whole thing needs to be made more
-portable.
-
---- src/Makefile.orig
-+++ src/Makefile
-@@ -89,7 +89,6 @@ endif
-
- # dynamic linking (should not be used in FreeBSD
- ifneq ($(shell uname -s),FreeBSD)
-- LDLIBS += -ldl
- endif
-
- ifneq (, $(shell which pkg-config))
Home |
Main Index |
Thread Index |
Old Index