openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-12 12:19:10 +00:00
Code Issues Projects Releases Wiki Activity

Remove the REORDER_DEPENDENCIES mechanism.

Browse Source 
The xenocara build process is not writing in the source tree.
This and previous commits was done in cooperation with natano@
and deraadt@
This commit is contained in:
matthieu
2016-10-11 22:36:53 +00:00
parent fd18c20e72
commit ecf19b24f5
3 changed files with 3 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/mk/Makefile
View File

@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2012/11/03 15:19:02 espie Exp $ # $OpenBSD: Makefile,v 1.7 2016/10/11 22:36:53 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
FILES= automake.dep bsd.xconf.mk bsd.xorg.mk package_version.m4 FILES= bsd.xconf.mk bsd.xorg.mk package_version.m4
all: all:

37
share/mk/automake.dep
View File

@@ -1,37 +0,0 @@
# $OpenBSD: automake.dep,v 1.2 2014/05/19 21:09:08 matthieu Exp $
configure configure.ac
configure configure.in
/Makefile.in /Makefile.am
/Makefile.in configure.in
/Makefile.in configure.ac
/Makefile.in aclocal.m4
aclocal.m4 configure.in
aclocal.m4 configure.ac
aclocal.m4 acinclude.m4
/config.h.in configure.in
/config.h.in configure.ac
/config.h.in aclocal.m4
/do-not-use-config.h.in configure.ac
/do-not-use-config.h.in aclocal.m4
configure configure.in
configure configure.ac
configure aclocal.m4
stamp-h.in configure.in
stamp-h.in configure.ac
stamp-h.in aclocal.m4
stamp-h.in acconfig.h
# kde files
acinclude.m4 admin/cvs.sh
configure.in admin/cvs.sh
/Makefile.am admin/cvs.sh
subdirs admin/cvs.sh
/Makefile.am subdirs
/Makefile.am /Makefile.am.in
subdirs /Makefile.am.in
configure.files subdirs
configure.files /configure.in.in
configure.files admin/configure.in.min
configure.in configure.files
acinclude.m4 admin/libtool.m4.in
acinclude.m4 admin/acinclude.m4.in
acinclude.m4 libltdl/ltdl.m4

23
share/mk/bsd.xorg.mk
View File

@@ -1,4 +1,4 @@
# $OpenBSD: bsd.xorg.mk,v 1.54 2016/10/10 13:34:43 matthieu Exp $ -*- makefile -*- # $OpenBSD: bsd.xorg.mk,v 1.55 2016/10/11 22:36:53 matthieu Exp $ -*- makefile -*-
# #
# Copyright <20> 2006,2012 Matthieu Herrb # Copyright <20> 2006,2012 Matthieu Herrb
# #
@@ -141,31 +141,10 @@ all: config.status
@exec ${MAKE} ${_lt_libs} @exec ${MAKE} ${_lt_libs}
.endif .endif
REORDER_DEPENDENCIES += ${X11BASE}/share/mk/automake.dep
ECHO_REORDER ?= :
.if !target(config.status) .if !target(config.status)
config.status: config.status:
.if defined(XENOCARA_RERUN_AUTOCONF) && ${XENOCARA_RERUN_AUTOCONF:L} == "yes" .if defined(XENOCARA_RERUN_AUTOCONF) && ${XENOCARA_RERUN_AUTOCONF:L} == "yes"
cd ${_SRCDIR}; ${AUTOTOOLS_ENV} exec autoreconf -v --install --force cd ${_SRCDIR}; ${AUTOTOOLS_ENV} exec autoreconf -v --install --force
.else
.if !defined(NO_REORDER)
@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
tsort -r|while read f; do \
cd ${_SRCDIR}; \
case $$f in \
/*) \
find . -name $${f#/} -print| while read i; \
do ${ECHO_REORDER} "Touching $$i"; touch $$i; done \
;; \
*) \
if test -e $$f ; then \
${ECHO_REORDER} "Touching $$f"; touch $$f; \
fi \
;; \
esac; done
.endif
.endif .endif
${CONFIGURE_ENV} PATH=$(XENOCARA_PATH) \ ${CONFIGURE_ENV} PATH=$(XENOCARA_PATH) \
exec sh ${_SRCDIR}/configure --prefix=${X11BASE} \ exec sh ${_SRCDIR}/configure --prefix=${X11BASE} \