From 54c55dff359b7d3c55afff23b9a367a22e7feb96 Mon Sep 17 00:00:00 2001 From: dholland Date: Tue, 5 Sep 2017 07:42:00 +0000 Subject: Need to patch Makefile.in, not Makefile. Oops. --- devel/frama-c/distinfo | 4 +- .../patches/patch-src_plugins_e-acsl_Makefile | 64 ---------------------- .../patches/patch-src_plugins_e-acsl_Makefile.in | 64 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile create mode 100644 devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in diff --git a/devel/frama-c/distinfo b/devel/frama-c/distinfo index 95565ecec5f..8c3bc68ca33 100644 --- a/devel/frama-c/distinfo +++ b/devel/frama-c/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2017/09/05 07:30:00 dholland Exp $ +$NetBSD: distinfo,v 1.8 2017/09/05 07:42:00 dholland Exp $ SHA1 (frama-c-Phosphorus-20170501.tar.gz) = d9372127ba80636cc1c692a141a7a02dee8325da RMD160 (frama-c-Phosphorus-20170501.tar.gz) = 24a5b8578491d3c15aa539da69062803d0c6d137 @@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = d9a23653196d4586c3cca87091518aea6791ddcc SHA1 (patch-configure) = a415684ab5ecb4fed276dede90439fa8ba6a09ed SHA1 (patch-share_Makefile.common) = f5230aee768e6af4c7458d96f1f210172daa9bb2 SHA1 (patch-src_libraries_utils_c__bindings.c) = b37db1c51e9082e4a328a6a7189f57db3f12d624 -SHA1 (patch-src_plugins_e-acsl_Makefile) = 02542a247a7f4b266c7e9139c4ee555dda5fd1bb +SHA1 (patch-src_plugins_e-acsl_Makefile.in) = 8b1c4838ecd609504c1070917c0b61433f1e1f12 SHA1 (patch-src_plugins_wp_configure) = 6f0fb756d2460b6abf27313d367672e293a8d9e7 SHA1 (patch-src_plugins_wp_configure.ac) = 3b15ff7b551da79ad1580b134258631f1527bc42 SHA1 (patch-src_plugins_wp_share_coqwp_Zbits.v) = 26fac23dc015087b7126e40a47d566eb49a24293 diff --git a/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile b/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile deleted file mode 100644 index 1870ce52648..00000000000 --- a/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-src_plugins_e-acsl_Makefile,v 1.1 2017/09/05 07:30:00 dholland Exp $ - -Don't install nonexecutables with execute permission. - ---- src/plugins/e-acsl/Makefile~ 2017-09-05 07:10:24.721100926 +0000 -+++ src/plugins/e-acsl/Makefile -@@ -157,7 +157,7 @@ EACSL_JEMALLOC_LIB = $(EACSL_LIBDIR)/$(E - $(EACSL_JEMALLOC_LIB): - cd $(EACSL_JEMALLOC_DIR) && $(MAKE) $(MAKEOPTS) - $(MKDIR) $(EACSL_LIBDIR) -- $(CP) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@ -+ $(CPNX) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@ - - EACSL_GMP_DIR := $(EACSL_PLUGIN_DIR)/contrib/libgmp - EACSL_GMP_LIBNAME = libeacsl-gmp.a -@@ -187,7 +187,7 @@ else - $(EACSL_GMP_LIB): - cd $(EACSL_GMP_DIR) && $(MAKE) $(MAKEOPTS) - $(MKDIR) $(EACSL_LIBDIR) -- $(CP) $(EACSL_GMP_DIR)/.libs/libgmp.a $@ -+ $(CPNX) $(EACSL_GMP_DIR)/.libs/libgmp.a $@ - endif - - all:: $(EACSL_JEMALLOC_LIB) $(EACSL_GMP_LIB) -@@ -367,32 +367,32 @@ MANUALS=$(wildcard $(E_ACSL_DIR)/doc/man - install:: - $(PRINT_INSTALL) E-ACSL share files - $(MKDIR) $(FRAMAC_DATADIR)/e-acsl -- $(CP) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl -+ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl - $(MKDIR) $(FRAMAC_DATADIR)/e-acsl/bittree_model \ - $(FRAMAC_DATADIR)/e-acsl/segment_model \ - $(FRAMAC_DATADIR)/e-acsl/glibc -- $(CP) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \ -+ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \ - $(FRAMAC_DATADIR)/e-acsl/bittree_model -- $(CP) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \ -+ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \ - $(FRAMAC_DATADIR)/e-acsl/segment_model -- $(CP) $(E_ACSL_DIR)/share/e-acsl/glibc/* \ -+ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/glibc/* \ - $(FRAMAC_DATADIR)/e-acsl/glibc - # manuals are not present in standard distribution. - # Don't fail because of that. - ifneq ("$(MANUALS)","") - $(PRINT_INSTALL) E-ACSL manuals - $(MKDIR) $(FRAMAC_DATADIR)/manuals -- $(CP) $(MANUALS) $(FRAMAC_DATADIR)/manuals; -+ $(CPNX) $(MANUALS) $(FRAMAC_DATADIR)/manuals; - endif - $(PRINT_INSTALL) E-ACSL libraries - $(MKDIR) $(LIBDIR) -- $(CP) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR) -+ $(CPNX) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR) - $(PRINT_INSTALL) E-ACSL scripts - $(MKDIR) $(BINDIR) - $(CP) $(E_ACSL_DIR)/scripts/e-acsl-gcc.sh $(BINDIR)/ - $(PRINT_INSTALL) E-ACSL man pages - $(MKDIR) $(MANDIR)/man1 -- $(CP) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/ -+ $(CPNX) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/ - - uninstall:: - $(PRINT_RM) E-ACSL share files diff --git a/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in b/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in new file mode 100644 index 00000000000..134ab433bcf --- /dev/null +++ b/devel/frama-c/patches/patch-src_plugins_e-acsl_Makefile.in @@ -0,0 +1,64 @@ +$NetBSD: patch-src_plugins_e-acsl_Makefile.in,v 1.1 2017/09/05 07:42:00 dholland Exp $ + +Don't install nonexecutables with execute permission. + +--- src/plugins/e-acsl/Makefile.in~ 2017-09-05 07:10:24.721100926 +0000 ++++ src/plugins/e-acsl/Makefile.in +@@ -157,7 +157,7 @@ EACSL_JEMALLOC_LIB = $(EACSL_LIBDIR)/$(E + $(EACSL_JEMALLOC_LIB): + cd $(EACSL_JEMALLOC_DIR) && $(MAKE) $(MAKEOPTS) + $(MKDIR) $(EACSL_LIBDIR) +- $(CP) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@ ++ $(CPNX) $(EACSL_JEMALLOC_DIR)/lib/libjemalloc.a $@ + + EACSL_GMP_DIR := $(EACSL_PLUGIN_DIR)/contrib/libgmp + EACSL_GMP_LIBNAME = libeacsl-gmp.a +@@ -187,7 +187,7 @@ else + $(EACSL_GMP_LIB): + cd $(EACSL_GMP_DIR) && $(MAKE) $(MAKEOPTS) + $(MKDIR) $(EACSL_LIBDIR) +- $(CP) $(EACSL_GMP_DIR)/.libs/libgmp.a $@ ++ $(CPNX) $(EACSL_GMP_DIR)/.libs/libgmp.a $@ + endif + + all:: $(EACSL_JEMALLOC_LIB) $(EACSL_GMP_LIB) +@@ -367,32 +367,32 @@ MANUALS=$(wildcard $(E_ACSL_DIR)/doc/man + install:: + $(PRINT_INSTALL) E-ACSL share files + $(MKDIR) $(FRAMAC_DATADIR)/e-acsl +- $(CP) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl ++ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/*.[ch] $(FRAMAC_DATADIR)/e-acsl + $(MKDIR) $(FRAMAC_DATADIR)/e-acsl/bittree_model \ + $(FRAMAC_DATADIR)/e-acsl/segment_model \ + $(FRAMAC_DATADIR)/e-acsl/glibc +- $(CP) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \ ++ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/bittree_model/* \ + $(FRAMAC_DATADIR)/e-acsl/bittree_model +- $(CP) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \ ++ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/segment_model/* \ + $(FRAMAC_DATADIR)/e-acsl/segment_model +- $(CP) $(E_ACSL_DIR)/share/e-acsl/glibc/* \ ++ $(CPNX) $(E_ACSL_DIR)/share/e-acsl/glibc/* \ + $(FRAMAC_DATADIR)/e-acsl/glibc + # manuals are not present in standard distribution. + # Don't fail because of that. + ifneq ("$(MANUALS)","") + $(PRINT_INSTALL) E-ACSL manuals + $(MKDIR) $(FRAMAC_DATADIR)/manuals +- $(CP) $(MANUALS) $(FRAMAC_DATADIR)/manuals; ++ $(CPNX) $(MANUALS) $(FRAMAC_DATADIR)/manuals; + endif + $(PRINT_INSTALL) E-ACSL libraries + $(MKDIR) $(LIBDIR) +- $(CP) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR) ++ $(CPNX) $(EACSL_LIBDIR)/libeacsl-*.a $(LIBDIR) + $(PRINT_INSTALL) E-ACSL scripts + $(MKDIR) $(BINDIR) + $(CP) $(E_ACSL_DIR)/scripts/e-acsl-gcc.sh $(BINDIR)/ + $(PRINT_INSTALL) E-ACSL man pages + $(MKDIR) $(MANDIR)/man1 +- $(CP) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/ ++ $(CPNX) $(E_ACSL_DIR)/man/e-acsl-gcc.sh.1 $(MANDIR)/man1/ + + uninstall:: + $(PRINT_RM) E-ACSL share files -- cgit v1.2.3