Attachment #183648 for bug #220156

View | Details | Raw Unified | Return to bug 220156
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-5 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= miller	3	PORTNAME= miller
4	PORTVERSION= 3.3.2	4	PORTVERSION= 5.2.1
5	DISTVERSIONPREFIX=v	5	DISTVERSIONPREFIX=v
6	CATEGORIES= textproc	6	CATEGORIES= textproc
7		7
Lines 20-27 Link Here
20		20
21	BROKEN_aarch64= Fails to compile: undefined reference to .mcount	21	BROKEN_aarch64= Fails to compile: undefined reference to .mcount
22		22
23	post-configure:
24	${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
25	${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
26
27	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (johnkerl-miller-v3.3.2_GH0.tar.gz) = 77cbec3f41b60361ce1c7b6dd7fa4d253c7ba169db270565862f523ca965eb96	1	TIMESTAMP = 1497938440
2	SIZE (johnkerl-miller-v3.3.2_GH0.tar.gz) = 3205282	2	SHA256 (johnkerl-miller-v5.2.1_GH0.tar.gz) = 0160e5fbbff7c3606037b616b5e30a714d16bb160a950d51fde112fca9d6a763
		3	SIZE (johnkerl-miller-v5.2.1_GH0.tar.gz) = 5020833




--- c/Makefile.orig	2016-01-31 11:19:35 UTC
+++ c/Makefile
@@ -370,7 +370,7 @@ mlr_LDADD = \
 			lib/libmlr.la \
 			dsls/libfdsl.la \
 			dsls/libpdsl.la \
-			-lm
+			-lm -lc
 
 
 # Other executable variants
@@ -483,15 +483,15 @@ clean-noinstPROGRAMS:
 
 mlr$(EXEEXT): $(mlr_OBJECTS) $(mlr_DEPENDENCIES) $(EXTRA_mlr_DEPENDENCIES) 
 	@rm -f mlr$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS) -lc
 
 mlrg$(EXEEXT): $(mlrg_OBJECTS) $(mlrg_DEPENDENCIES) $(EXTRA_mlrg_DEPENDENCIES) 
 	@rm -f mlrg$(EXEEXT)
-	$(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS) -lc
 
 mlrp$(EXEEXT): $(mlrp_OBJECTS) $(mlrp_DEPENDENCIES) $(EXTRA_mlrp_DEPENDENCIES) 
 	@rm -f mlrp$(EXEEXT)
-	$(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS) -lc
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)




--- libtool.orig	2016-01-31 11:54:21 UTC
+++ libtool
@@ -7514,10 +7514,6 @@ func_mode_link ()
 	    # These systems don't actually have a C library (as such)
 	    test X-lc = "X$arg" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test X-lc = "X$arg" && continue
-	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
 	    func_append deplibs " System.ltframework"

Return to bug 220156

Lines 1-30 Link Here

(-)files/extra-patch-c_Makefile (-30 lines)
1	--- c/Makefile.orig 2016-01-31 11:19:35 UTC
2	+++ c/Makefile
3	@@ -370,7 +370,7 @@ mlr_LDADD = \
4	lib/libmlr.la \
5	dsls/libfdsl.la \
6	dsls/libpdsl.la \
7	- -lm
8	+ -lm -lc
9
10
11	# Other executable variants
12	@@ -483,15 +483,15 @@ clean-noinstPROGRAMS:
13
14	mlr$(EXEEXT): $(mlr_OBJECTS) $(mlr_DEPENDENCIES) $(EXTRA_mlr_DEPENDENCIES)
15	@rm -f mlr$(EXEEXT)
16	- $(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS)
17	+ $(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS) -lc
18
19	mlrg$(EXEEXT): $(mlrg_OBJECTS) $(mlrg_DEPENDENCIES) $(EXTRA_mlrg_DEPENDENCIES)
20	@rm -f mlrg$(EXEEXT)
21	- $(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS)
22	+ $(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS) -lc
23
24	mlrp$(EXEEXT): $(mlrp_OBJECTS) $(mlrp_DEPENDENCIES) $(EXTRA_mlrp_DEPENDENCIES)
25	@rm -f mlrp$(EXEEXT)
26	- $(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS)
27	+ $(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS) -lc
28
29	mostlyclean-compile:
30	-rm -f *.$(OBJEXT)

Lines 1-13 Link Here

(-)files/extra-patch-libtool (-13 lines)
1	--- libtool.orig 2016-01-31 11:54:21 UTC
2	+++ libtool
3	@@ -7514,10 +7514,6 @@ func_mode_link ()
4	# These systems don't actually have a C library (as such)
5	test X-lc = "X$arg" && continue
6	;;
7	- --openbsd* \| --freebsd* \| --dragonfly* \| --bitrig*)
8	- # Do not include libc due to us having libc/libc_r.
9	- test X-lc = "X$arg" && continue
10	- ;;
11	--rhapsody* \| --darwin1.[012])
12	# Rhapsody C and math libraries are in the System framework
13	func_append deplibs " System.ltframework"