Page MenuHomeFreeBSD
Files F141978079

D4385.id10748.diff
No OneTemporary
Actions

D4385.id10748.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1970,6 +1970,10 @@
CHECKSUM_ALGORITHMS?= sha256
DISTINFO_FILE?= ${MASTERDIR}/distinfo
+TIMESTAMP= 1449231300
+.if exists(${DISTINFO_FILE})
+TIMESTAMP!= ${AWK} -F= -v ts=${TIMESTAMP} '/^timestamp/ { ts=$$2 } END { print ts}' ${DISTINFO_FILE}
+.endif
MAKE_FLAGS?= -f
MAKEFILE?= Makefile
@@ -1981,7 +1985,9 @@
CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- MANPREFIX="${MANPREFIX}"
+ MANPREFIX="${MANPREFIX}" \
+ SOURCE_DATE_EPOCH=${TIMESTAMP}
+PKG_ENV+= SOURCE_DATE_EPOCH=${TIMESTAMP}
# Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
# gcc 4.x enable strict aliasing optimization with -O2 which is known to break
@@ -2608,8 +2614,8 @@
GNU_CONFIGURE_MANPREFIX?= ${MANPREFIX}
CONFIG_SITE?= ${PORTSDIR}/Templates/config.site
CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
-.if defined(X_BUILD_FOR)
-CONFIGURE_ARGS+= --host=${X_BUILD_FOR}
+.if defined(X_BUILD_FOR) || defined(CROSS_BUILD)
+CONFIGURE_ARGS+= --host=${CROSS_BUILD:UX_BUILD_FOR}
.endif
CONFIGURE_ENV+= CONFIG_SITE=${CONFIG_SITE} lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
HAS_CONFIGURE= yes
@@ -4195,7 +4201,11 @@
makesum: check-checksum-algorithms
@cd ${.CURDIR} && ${MAKE} fetch NO_CHECKSUM=yes \
DISABLE_SIZE=yes
- @if [ -f ${DISTINFO_FILE} ]; then ${CAT} /dev/null > ${DISTINFO_FILE}; fi
+ @if [ -f ${DISTINFO_FILE} ]; then \
+ if ${GREP} -q "^timestamp" ${DISTINFO_FILE}; then \
+ ${GREP} -v "^timestamp" ${DISTINFO_FILE} > ${DISTINFO_FILE}.sav; \
+ fi ; \
+ fi
@( \
cd ${DISTDIR}; \
\
@@ -4206,11 +4216,19 @@
eval alg_executable=\$$$$alg; \
\
if [ $$alg_executable != "NO" ]; then \
- $$alg_executable $$file >> ${DISTINFO_FILE}; \
+ $$alg_executable $$file >> ${DISTINFO_FILE}.new; \
fi; \
done; \
- ${ECHO_CMD} "SIZE ($$file) = `${STAT} -f \"%z\" $$file`" >> ${DISTINFO_FILE}; \
- done \
+ ${ECHO_CMD} "SIZE ($$file) = `${STAT} -f \"%z\" $$file`" >> ${DISTINFO_FILE}.new; \
+ done ; \
+ if [ ! -f ${DISTINFO_FILE}.sav ] || ! cmp -s ${DISTINFO_FILE}.sav ${DISTINFO_FILE}.new ; then \
+ ${ECHO_CMD} "timestamp=`date '+%s'`" > ${DISTINFO_FILE} ; \
+ ${CAT} ${DISTINFO_FILE}.new >> ${DISTINFO_FILE} ; \
+ fi ; \
+ rm ${DISTINFO_FILE}.new ; \
+ if [ -f ${DISTINFO_FILE}.sav ]; then \
+ ${RM} ${DISTINFO_FILE}.sav ; \
+ fi; \
)
.endif

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 15, 11:10 AM (17 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27647267
Default Alt Text
D4385.id10748.diff (2 KB)

Event Timeline