Allow all subdirectories to be optional via SUBDIR.${MK_*}
ClosedPublic
Actions

Authored by emaste on Oct 21 2016, 5:04 PM.

Details

Reviewers

brooks
imp
br
bdrewery

Commits

rS307741: Allow all subdirectories to be optional via SUBDIR.${MK_*}

Summary

Reported by: br
Pointy hat to: emaste

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste updated this revision to Diff 21596.Oct 21 2016, 5:04 PM

emaste retitled this revision from to Allow all subdirectories to be optional via SUBDIR.${MK_*}.

emaste updated this object.

emaste edited the test plan for this revision. (Show Details)

emaste added reviewers: brooks, imp, bdrewery, br.

I tested. It works

This revision is now accepted and ready to land.Oct 21 2016, 5:13 PM

This is clearly an oversight on my part.

Closed by commit rS307741: Allow all subdirectories to be optional via SUBDIR.${MK_*} (authored by emaste). · Explain WhyOct 21 2016, 5:25 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

share/

mk/

bsd.subdir.mk

2 lines

Diff 21598

View Options

head/share/mk/bsd.subdir.mk

	# $FreeBSD$			# $FreeBSD$

	PORTNAME= python27			PORTNAME= python27
	PORTVERSION= 2.7.9			PORTVERSION= 2.7.10
	PORTREVISION= 1
	CATEGORIES= lang python ipv6			CATEGORIES= lang python ipv6
	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}			MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
	DISTNAME= Python-${PORTVERSION}			DISTNAME= Python-${PORTVERSION}
	DIST_SUBDIR= python			DIST_SUBDIR= python

	MAINTAINER= python@FreeBSD.org			MAINTAINER= python@FreeBSD.org
	COMMENT= Interpreted object-oriented programming language			COMMENT= Interpreted object-oriented programming language

	▲ Show 20 Lines • Show All 86 Lines • ▼ Show 20 Lines
	# See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650			# See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
	.if !exists(/usr/bin/ypcat) \|\| defined(WITHOUT_NIS)			.if !exists(/usr/bin/ypcat) \|\| defined(WITHOUT_NIS)
	PLIST_SUB+= NO_NIS="@comment "			PLIST_SUB+= NO_NIS="@comment "
	.else			.else
	PLIST_SUB+= NO_NIS=""			PLIST_SUB+= NO_NIS=""
	.endif			.endif

	post-patch:			post-patch:
	@${REINPLACE_CMD} -e \			@${REINPLACE_CMD} -e \
				koobsUnsubmitted Done Inline Actions Rationale needed for this (as its not included in your revision SUMMARY/ proposed commit log messages) koobs: Rationale needed for this (as its not included in your revision SUMMARY/ proposed commit log…
				antoineUnsubmitted Done Inline Actions This looks wrong in multiple ways: hardcoded /usr/local instead of ${LOCALBASE} CPPFLAGS / LDFLAGS / LIBS are already passed in environment of the configure script by bsd.port.mk LIBS should be preferred over LDFLAGS antoine: This looks wrong in multiple ways: - hardcoded /usr/local instead of ${LOCALBASE} - CPPFLAGS /…
				brnrdAuthorUnsubmitted Done Inline Actions Fixed the /usr/local after inspecting portling -AC output. Without passing LDFLAGS and CPPFLAGS to configure it picks up libcrypto from base configure:8550: checking for RAND_egd in -lcrypto configure:8575: cc -o conftest -O2 -fno-strict-aliasing -pipe -march=native -fstack-protector -lpthread -Wl,-rpath ,/usr/local/lib -Wl,-rpath=/usr/lib:/usr/local/lib -fstack-protector conftest.c -lcrypto >&5 configure:8575: $? = 0 brnrd: - Fixed the /usr/local after inspecting portling -AC output. - Without passing LDFLAGS and…
	's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \			's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
	${PATCH_WRKSRC}/Lib/pydoc.py			${PATCH_WRKSRC}/Lib/pydoc.py
	.if ${PORT_OPTIONS:MSEM}			.if ${PORT_OPTIONS:MSEM}
	@# do not use SEM_EXTRA_PATCHES here, since patch-setup.py overlaps with this one			@# do not use SEM_EXTRA_PATCHES here, since patch-setup.py overlaps with this one
	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py			@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
	.endif			.endif

	.if !exists(/usr/bin/ypcat) \|\| defined(WITHOUT_NIS)			.if !exists(/usr/bin/ypcat) \|\| defined(WITHOUT_NIS)
	Show All 12 Lines

Allow all subdirectories to be optional via SUBDIR.${MK_*}ClosedPublicActions