[gcc-7] 242/354: libgnatvsn: pass configured directories to installed project. As configure receives non-multiarch paths, the contents are stil wrong. Remove unneeded (and wrong) project from cross builds.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:51:00 UTC 2017 

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit b79a1f9274bb7938b36eefff5fa17ff19cf1e8dd
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jun 30 12:56:23 2017 +0000

    libgnatvsn: pass configured directories to installed project.
    As configure receives non-multiarch paths, the contents are stil wrong.
    Remove unneeded (and wrong) project from cross builds.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9564 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/gnatvsn.gpr                 | 31 ---------------------------
 debian/patches/ada-libgnatvsn.diff | 44 ++++++++++++++++++++++++++++----------
 debian/rules.d/binary-ada.mk       |  5 +----
 3 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/debian/gnatvsn.gpr b/debian/gnatvsn.gpr
deleted file mode 100644
index c36aca7..0000000
--- a/debian/gnatvsn.gpr
+++ /dev/null
@@ -1,31 +0,0 @@
---  Project file for use with GNAT
---  Copyright (c) 2005, 2008 Ludovic Brenta <ludovic at ludovic-brenta.org>
---
---  This program is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 3 of the License, or
---  (at your option) any later version.
---
---  This program is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
---
---  This project file is designed to help build applications that use
---  GNAT project files.  Here is an example of how to use this project file:
---
---  with "gnatvsn";
---  project Example is
---     for Object_Dir use "obj";
---     for Exec_Dir use ".";
---     for Main use ("example");
---  end Example;
-
-library project Gnatvsn is
-   for Library_Name use "gnatvsn";
-   for Library_Dir use "/usr/lib";
-   for Library_Kind use "dynamic";
-   for Source_Dirs use ("/usr/share/ada/adainclude/gnatvsn");
-   for Library_ALI_Dir use "/usr/lib/ada/adalib/gnatvsn";
-   for Externally_Built use "true";
-end Gnatvsn;
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
index 697f389..6416b1b 100644
--- a/debian/patches/ada-libgnatvsn.diff
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -45,8 +45,19 @@
 +
 +} | tee -a config.log
 --- /dev/null
++++ b/src/libgnatvsn/gnatvsn.gpr.sed
+@@ -0,0 +1,8 @@
++library project Gnatvsn is
++   for Library_Name use "gnatvsn";
++   for Library_Kind use "dynamic";
++   for Library_Dir use "lib_inst_dir";
++   for Source_Dirs use ("src_inst_dir");
++   for Library_ALI_Dir use "ali_inst_dir";
++   for Externally_Built use "true";
++end Gnatvsn;
+--- /dev/null
 +++ b/src/libgnatvsn/Makefile.in
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,161 @@
 +# Makefile for libgnatvsn.
 +#   Copyright (c) 2006 Ludovic Brenta <ludovic at ludovic-brenta.org>
 +#   Copyright (c) 2017 Nicolas Boulenguez <nicolas at debian.org>
@@ -91,9 +102,10 @@
 +
 +LIB_VERSION := $(shell expr '$(BASEVER)' : '\([0-9]\+\)')
 +
-+src_inst_dir := $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
-+ali_inst_dir := $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
-+lib_inst_dir := $(DESTDIR)$(libdir)
++src_inst_dir := $(prefix)/share/ada/adainclude/gnatvsn
++gpr_inst_dir := $(prefix)/share/gpr
++ali_inst_dir := $(libdir)/ada/adalib/gnatvsn
++lib_inst_dir := $(libdir)
 +
 +# Initial value of variables accumulationg build flags.
 +adaflags := -gnatn
@@ -143,7 +155,7 @@
 +           $(addsuffix .adb, $(UNITS_BOTH) $(SEPARATES))
 +OBJECTS := $(addsuffix .o, $(UNITS_BOTH) snames $(UNITS_SPEC) version)
 +
-+all: libgnatvsn.a libgnatvsn.so.$(LIB_VERSION)
++all: libgnatvsn.a libgnatvsn.so.$(LIB_VERSION) gnatvsn.gpr
 +
 +libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
 +	$(CC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ $(ldflags) $(ldlibs)
@@ -188,15 +200,25 @@
 +snames.adb snames.ads:
 +	ln -s ../../gcc/ada/$@
 +
++gnatvsn.gpr: $(srcdir)/gnatvsn.gpr.sed
++	sed '$(foreach v,src ali lib,s|$(v)_inst_dir|$($(v)_inst_dir)|;)' \
++	  $< > $@
++
 +install: all
-+	mkdir -p $(lib_inst_dir) $(src_inst_dir) $(ali_inst_dir)
-+	$(INSTALL_DATA) libgnatvsn.a libgnatvsn.so.* $(lib_inst_dir)
-+	cd $(lib_inst_dir) && ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
-+	$(INSTALL_DATA) *.adb *.ads *.c *.h $(src_inst_dir)
-+	$(INSTALL) -m 0444 *.ali $(ali_inst_dir)
++	mkdir -p $(DESTDIR)$(gpr_inst_dir)
++	$(INSTALL_DATA) gnatvsn.gpr $(DESTDIR)$(gpr_inst_dir)
++	mkdir -p $(DESTDIR)$(lib_inst_dir)
++	$(INSTALL_DATA) libgnatvsn.a libgnatvsn.so.* $(DESTDIR)$(lib_inst_dir)
++	cd $(DESTDIR)$(lib_inst_dir) && ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
++	mkdir -p $(DESTDIR)$(src_inst_dir)
++	$(INSTALL_DATA) *.adb *.ads *.c *.h $(DESTDIR)$(src_inst_dir)
++	mkdir -p $(DESTDIR)$(ali_inst_dir)
++	$(INSTALL) -m 0444 *.ali $(DESTDIR)$(ali_inst_dir)
 +
 +clean:
-+	rm -rf *.ali obj-static obj-shared libgnatvsn* *.adb *.ads *.c *.h
++	rm -fr obj-static obj-shared
++	rm -f *.ali libgnatvsn* *.adb *.ads *.c *.h gnatvsn.gpr
++	rm -f Makefile config.log
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
 @@ -187,6 +187,16 @@
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 46abc53..3e5a52a 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -141,14 +141,11 @@ $(binary_stamp)-libgnatvsn: $(install_stamp)
 ifneq (,$(filter $(build_type), build-native cross-build-native))
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) usr/lib/ada/adalib/gnatvsn
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) usr/share/ada/adainclude/gnatvsn
-	dh_install -p$(p_lgnatvsn_dev) \
-	   debian/gnatvsn.gpr usr/share/gpr
+	dh_install -p$(p_lgnatvsn_dev) usr/share/gpr/gnatvsn.gpr
 else
 	mkdir -p $(d_lgnatvsn_dev)/$(gcc_lib_dir)/{adalib,adainclude}/gnatvsn
 	mv $(d)/usr/lib/ada/adalib/gnatvsn $(d_lgnatvsn_dev)/$(gcc_lib_dir)/adalib/.
 	mv $(d)/usr/share/ada/adainclude/gnatvsn $(d_lgnatvsn_dev)/$(gcc_lib_dir)/adainclude/.
-	dh_install -p$(p_lgnatvsn_dev) \
-	   debian/gnatvsn.gpr $(gcc_lib_dir)/adainclude
 endif
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) $(usr_lib)/libgnatvsn.a
 	dh_link -p$(p_lgnatvsn_dev) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git

More information about the Reproducible-commits mailing list