Attachment #85846 for bug #122154

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




#

PORTNAME=	e2fsprogs
PORTVERSION=	1.40.8
PORTREVISION?=	0
CATEGORIES?=	sysutils
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}

PLIST_SUB=	NLS="@comment "
.else
USE_GETTEXT=	yes
# We need to make sure that anything that is outside the root file
# system is statically linked, else we're in trouble if e2fsck is needed
# for boot:
MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
		../lib/libblkid.a  ../lib/libuuid.a" \
		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
PLIST_SUB=	NLS=""
.endif



.if ${MASTERDIR} == ${.CURDIR}
post-build:
# Relink e2fsck statically - We need to make sure that tools for the root file
# system are statically linked against anything that is outside the root fs,
# else we're in trouble if e2fsck is needed for boot:
# (we don't use e2fsck.static, since we can link libc.so dynamically)
	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
		&& ${MAKE} e2fsck \
		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
		../lib/libblkid.a  ../lib/libuuid.a" \
		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
# Regression check: avoid a port (not upstream!) regression from 1.40.5,
# check that e2fsck isn't dynalinked against anything but libc.so:
	@${ECHO_CMD} -n "===>  checking that e2fsck depends on no shared objects beyond libc.so: "
	@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \

Lines 1-3 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
1	MD5 (e2fsprogs-1.40.7.tar.gz) = e24f9d517a2d7ba3cff29337ae73c10a	1	MD5 (e2fsprogs-1.40.8.tar.gz) = 450e2fb2461b2296fec770ff8fc147ed
2	SHA256 (e2fsprogs-1.40.7.tar.gz) = 59765723709db286abbaf6418a06b047455919593959d219b5c29ddf72ff2c05	2	SHA256 (e2fsprogs-1.40.8.tar.gz) = 38df70f8b5ba121b11b02101cc399306a199d3c66c8185d8a2c0d07f5688eead
3	SIZE (e2fsprogs-1.40.7.tar.gz) = 4087067	3	SIZE (e2fsprogs-1.40.8.tar.gz) = 4102707

Return to bug 122154

Lines 6-12 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/Makefile (-8 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.40.7	9	PORTVERSION= 1.40.8
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= sysutils	11	CATEGORIES?= sysutils
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
Lines 51-62 Link Here
51	PLIST_SUB= NLS="@comment "	51	PLIST_SUB= NLS="@comment "
52	.else	52	.else
53	USE_GETTEXT= yes	53	USE_GETTEXT= yes
54	# We need to make sure that anything that is outside the root file
55	# system is statically linked, else we're in trouble if e2fsck is needed
56	# for boot:
57	MAKE_ARGS+= STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
58	../lib/libblkid.a ../lib/libuuid.a" \
59	LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
60	PLIST_SUB= NLS=""	54	PLIST_SUB= NLS=""
61	.endif	55	.endif
62		56
Lines 69-75 Link Here
69		63
70	.if ${MASTERDIR} == ${.CURDIR}	64	.if ${MASTERDIR} == ${.CURDIR}
71	post-build:	65	post-build:
72	# Avoid a regression from 1.40.5,	66	# Relink e2fsck statically - We need to make sure that tools for the root file
		67	# system are statically linked against anything that is outside the root fs,
		68	# else we're in trouble if e2fsck is needed for boot:
		69	# (we don't use e2fsck.static, since we can link libc.so dynamically)
		70	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
		71	&& ${MAKE} e2fsck \
		72	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
		73	../lib/libblkid.a ../lib/libuuid.a" \
		74	LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
		75	# Regression check: avoid a port (not upstream!) regression from 1.40.5,
73	# check that e2fsck isn't dynalinked against anything but libc.so:	76	# check that e2fsck isn't dynalinked against anything but libc.so:
74	@${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects beyond libc.so: "	77	@${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects beyond libc.so: "
75	@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \	78	@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \