[Pkg-ocaml-maint-commits] [ocamlbricks] 03/19: Refresh patches
Lucas Nussbaum
lucas at moszumanska.debian.org
Mon Oct 30 22:29:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
lucas pushed a commit to branch master
in repository ocamlbricks.
commit 202ef66d517c3ac36334fd6bd0ff4947319527f7
Author: Lucas Nussbaum <lucas at debian.org>
Date: Mon Oct 9 07:58:15 2017 +0200
Refresh patches
---
.../0002-Use-the-Debian-prefix-for-building.patch | 16 ++++++++-------
...Fix-the-build-on-non-native-architectures.patch | 4 +---
...GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch | 23 ----------------------
debian/patches/0004-install-stublibs.patch | 23 ++++++----------------
debian/patches/series | 1 -
5 files changed, 16 insertions(+), 51 deletions(-)
diff --git a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
index 54a188d..35c9ffd 100644
--- a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
+++ b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
@@ -9,25 +9,27 @@ Forwarded: not-needed
CONFIGME | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
-diff --git a/CONFIGME b/CONFIGME
-index 157db73..fad53e4 100644
--- a/CONFIGME
+++ b/CONFIGME
-@@ -34,11 +34,11 @@
-
- # Installation prefix, for example /usr or /usr/local
+@@ -35,7 +35,7 @@
+ # Run-time prefix, where resources will be really installed and available
+ # when the software will be launched. Examples are /usr or /usr/local.
# *No* trailing slash should be included.
-prefix=/usr/local
+prefix=${DESTDIR:-debian/tmp}
+ # Prefix for temporary or final installation; you should probably keep the
+ # default setting, which is ${prefix}. This variable has been introduced to
+@@ -45,7 +45,7 @@ prefix_install=${prefix}
+
# Prefix for host-wide configuration files; you should probably keep the
# default setting:
-configurationprefix=/etc
+configurationprefix=${prefix}/etc
- # Prefix for the locale files
+ # Prefix for the locale files (at run-time)
localeprefix=${prefix}/share/locale
-@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
+@@ -69,12 +69,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
# library or into ${ocaml_libraryprefix}, but you can change it if you really
# want to install into a different, custom prefix.
# *No* trailing slash should be included.
diff --git a/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
index 45d1837..3eee68d 100644
--- a/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
+++ b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
@@ -12,11 +12,9 @@ Forwarded: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
Makefile.d/ocamlmklib_wrapper.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
-diff --git a/Makefile.d/ocamlmklib_wrapper.sh b/Makefile.d/ocamlmklib_wrapper.sh
-index 420dfca..ca08798 100755
--- a/Makefile.d/ocamlmklib_wrapper.sh
+++ b/Makefile.d/ocamlmklib_wrapper.sh
-@@ -40,5 +40,9 @@ CMX=$(ocamlobjinfo _build/ocamlbricks.cma | awk '/Unit name/{x=tolower(substr($3
+@@ -40,5 +40,9 @@ CMX=$(ocamlobjinfo _build/ocamlbricks.cm
cd _build/
echo "Rebuilding library with ocamlmklib..."
echo '---'; set -x; ocamlc -a -linkall -dllib -locamlbricks_stubs -o ocamlbricks.cma $INCLUDES $CMO; set +x
diff --git a/debian/patches/0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch b/debian/patches/0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch
deleted file mode 100644
index cefc1c7..0000000
--- a/debian/patches/0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Thu, 20 Apr 2017 11:00:36 +0200
-Subject: In GETTEXT, fix f_ to avoid call to Obj.magic
-
-Bug: https://bugs.launchpad.net/ocamlbricks/+bug/1684507
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860405
----
- GETTEXT/gettext_builder.ml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/GETTEXT/gettext_builder.ml b/GETTEXT/gettext_builder.ml
-index 4805e95..0741cb2 100644
---- a/GETTEXT/gettext_builder.ml
-+++ b/GETTEXT/gettext_builder.ml
-@@ -58,5 +58,7 @@ module Make (TheTextDomainAndDirectory : TextDomainAndDirectory) : Gettext = str
-
- (* Public versions for format strings, with the type we like: *)
- let f_ english_format_string =
-- (Obj.magic dgettext TheTextDomainAndDirectory.text_domain ((Obj.magic english_format_string) : string));;
-+ let english_string = string_of_format english_format_string in
-+ let foreign_string = dgettext TheTextDomainAndDirectory.text_domain english_string in
-+ Scanf.format_from_string foreign_string english_format_string;;
- end;;
diff --git a/debian/patches/0004-install-stublibs.patch b/debian/patches/0004-install-stublibs.patch
index 75b1fb8..ee1928f 100644
--- a/debian/patches/0004-install-stublibs.patch
+++ b/debian/patches/0004-install-stublibs.patch
@@ -6,30 +6,19 @@ Subject: Install stublibs
Makefile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
-diff --git a/Makefile b/Makefile
-index dd54468..8702125 100644
--- a/Makefile
+++ b/Makefile
-@@ -433,18 +433,17 @@ install-libraries: libraries install-libraries-local
- if [ "$(NATIVE_LIBRARIES) $(BYTE_LIBRARIES)" == " " ]; then \
- echo "There are no native libraries to install: ok, no problem..."; \
- else \
-- (echo "Installing $$name libraries into "$(LIBRARYPREFIX)"/$$name/..."; \
-+ set -x ; (echo "Installing $$name libraries into "$(LIBRARYPREFIX)"/$$name/..."; \
- (mkdir -p $(LIBRARYPREFIX)/$$name &> /dev/null || true); \
- shopt -s nullglob; \
- cp -f META $(OTHER_LIBRARY_FILES_TO_INSTALL) \
- _build/*.cma _build/*.cmxa _build/*.a \
+@@ -443,10 +443,9 @@ install-libraries: libraries install-lib
+ _build/*.cma _build/*.cmxa _build/*.a _build/*.so \
`find _build/ -name \*.cmi | grep -v /myocamlbuild` \
`find _build/ -name \*.mli | grep -v /myocamlbuild` \
- $(LIBRARYPREFIX)/$$name/) && \
- if test -d $(LIBRARYPREFIX)/stublibs/; then \
+- find _build/ -name "dll*.so" -exec cp -f "{}" $(LIBRARYPREFIX)/stublibs/ ";" ; \
+- fi; \
+ $(LIBRARYPREFIX)/$$name/) ; \
+ mkdir -p $(LIBRARYPREFIX)/stublibs ; \
- find _build/ -name "dll*.so" -exec cp -f "{}" $(LIBRARYPREFIX)/stublibs/ ";" ; \
-- fi; \
-- echo 'Library installation was successful.'; \
-+ echo 'Library installation was successful.'; set +x ; \
++ find _build/ -name "dll*.so" -exec cp -f "{}" $(LIBRARYPREFIX)/stublibs/ ";" ; \
+ echo 'Library installation was successful.'; \
fi)
- # Uninstall programs and libraries:
diff --git a/debian/patches/series b/debian/patches/series
index be79e19..ef23491 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0002-Use-the-Debian-prefix-for-building.patch
0003-Fix-the-build-on-non-native-architectures.patch
0004-install-stublibs.patch
-0004-In-GETTEXT-fix-f_-to-avoid-call-to-Obj.magic.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git
More information about the Pkg-ocaml-maint-commits
mailing list