Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11360
Modified Files:
rpm.mk.in
Log Message:
Removing #line directives from (generated) files in rpm.mk[.in]
before creating the source tarball
makes these files newer than related files,
causing builds from the tarball (e.g., during `make rpm`)
to fail as "undesired" rules are triggered.
For clients, e.g., MapiLib.pm.c becomes newer than MapiLib.pm
(both generated from MapiLib.pm.i by swig), triggering `make rpm`
to do something like `gcc MapiLib.pm.c MapiLib.pm.i -o MapiLib.pm`,
which obviously cannot work.
While a proper solution that maintains (or fixes)
timestamps during #line directive removal is pending,
touching all files generated from *.i files after the
#line directive removal in rpm.mk[.in]
makes `make rpm` for clients work, again.
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/clients/rpm.mk.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- rpm.mk.in 12 Dec 2007 19:43:33 -0000 1.21
+++ rpm.mk.in 12 Dec 2007 20:10:12 -0000 1.22
@@ -66,5 +66,6 @@
find MonetDB-client-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh
! -exec grep -q '^#!' {} \; -exec chmod a-x {} \;
find MonetDB-client-* -type f ! -name \*.in ! -name configure ! -name
\*.spec -print | while read i; do test -f "$${i}.in" && rm -f "$${i}"; done ||
true
find MonetDB-client-* \( -name '*.[chm]' -o -name '*.cc' -o -name
'*.mal' \) -exec sed -n -e "/^#line/!w $${TMPDIR:-/var/tmp}/mn-dist-$$$$" {} \;
-exec chmod u+w {} \; -exec cp $${TMPDIR:-/var/tmp}/mn-dist-$$$$ {} \; && rm -f
$${TMPDIR:-/var/tmp}/mn-dist-$$$$
+ find MonetDB-client-* -type f ! -name \*.i -print | while read i; do
test -f "$${i}.i" && touch "$${i}"*; done || true
dist-hook: cleanup_distr
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
