diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-30 17:56:11 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-30 17:56:11 (EDT) |
| commit | 29434e8ca76673432fee45c7d9660e1287fb0f3c (patch) | |
| tree | 1a3cb8a892b88e5b9cff53e006f7f8dfbd070475 | |
| parent | 553fe53dea539945b31609f4ac7b98f4695294b2 (diff) | |
build, *.pkg.in/control: Get GCC ver from substvars
| -rwxr-xr-x | build | 4 | ||||
| -rw-r--r-- | cpp.pkg.in/control | 3 | ||||
| -rw-r--r-- | g++.pkg.in/control | 3 | ||||
| -rw-r--r-- | gcc.pkg.in/control | 3 | ||||
| -rw-r--r-- | substvars | 1 |
5 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,7 @@ #! /usr/bin/make -f +gcc_base_version = $$(sed 's/^GCC-Base-Version: //i' ../substvars) + build: install: @@ -8,7 +10,7 @@ install: for exe in cpp gcc g++; do \ dir="$${exe}-$${target}.data/usr/bin"; \ mkdir -p "$${dir}"; \ - ln -sf "$${target}-$${exe}-4.7" \ + ln -sf "$${target}-$${exe}-$(gcc_base_version)" \ "$${dir}/$${target}-$${exe}"; \ done; \ done diff --git a/cpp.pkg.in/control b/cpp.pkg.in/control index a835d86..fad3be5 100644 --- a/cpp.pkg.in/control +++ b/cpp.pkg.in/control @@ -1,6 +1,7 @@ Architecture: all Platform: all -Depends: gcc-defaults-common (= ${Binary-Version}), cpp-4.7-@PKG_TARGET_ARCH@ +Depends: gcc-defaults-common (= ${Binary-Version}), + cpp-${GCC-Base-Version}-@PKG_TARGET_ARCH@ Description: GNU C preprocessor for @PKG_TARGET_ARCH@ The C preprocessor implements the macro language used to transform C, C++, and Objective-C programs before they are compiled. It can also be useful on its diff --git a/g++.pkg.in/control b/g++.pkg.in/control index 0323823..cdbe93a 100644 --- a/g++.pkg.in/control +++ b/g++.pkg.in/control @@ -1,6 +1,7 @@ Architecture: all Platform: all -Depends: gcc-defaults-common (= ${Binary-Version}), g++-4.7-@PKG_TARGET_ARCH@ +Depends: gcc-defaults-common (= ${Binary-Version}), + g++-${GCC-Base-Version}-@PKG_TARGET_ARCH@ Description: GNU C++ compiler for @PKG_TARGET_ARCH@ This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. . diff --git a/gcc.pkg.in/control b/gcc.pkg.in/control index 9565da9..3b5042a 100644 --- a/gcc.pkg.in/control +++ b/gcc.pkg.in/control @@ -1,6 +1,7 @@ Architecture: all Platform: all -Depends: gcc-defaults-common (= ${Binary-Version}), gcc-4.7-@PKG_TARGET_ARCH@ +Depends: gcc-defaults-common (= ${Binary-Version}), + gcc-${GCC-Base-Version}-@PKG_TARGET_ARCH@ Description: GNU C compiler for @PKG_TARGET_ARCH@ This is the GNU C compiler, a fairly portable optimizing compiler for C. . diff --git a/substvars b/substvars new file mode 100644 index 0000000..bdce572 --- /dev/null +++ b/substvars @@ -0,0 +1 @@ +GCC-Base-Version: 4.7 |