diff options
| -rwxr-xr-x | build | 14 | ||||
| -rw-r--r-- | changelog | 1 | ||||
| -rwxr-xr-x | config | 2 | ||||
| -rw-r--r-- | control | 1 | ||||
| -rw-r--r-- | cpp.pkg.in/files | 1 | ||||
| -rw-r--r-- | g++.pkg.in/files | 1 | ||||
| -rw-r--r-- | gcc.pkg.in/files | 1 |
7 files changed, 9 insertions, 12 deletions
@@ -3,10 +3,12 @@ build: install: - mkdir -p dest/usr/bin - set -e; for target in $$(cat ../targets); do \ - ln -sf "$${target}-cpp-4.7" "dest/usr/bin/$${target}-cpp"; \ - ln -sf "$${target}-gcc-4.7" "dest/usr/bin/$${target}-gcc"; \ - ln -sf "$${target}-g++-4.7" "dest/usr/bin/$${target}-g++"; \ + set -e; \ + for target in $$(cat ../targets); do \ + for exe in cpp gcc g++; do \ + dir="$${exe}-$${target}.data/usr/bin"; \ + mkdir -p "$${dir}"; \ + ln -sf "$${target}-$${exe}-4.7" \ + "$${dir}/$${target}-$${exe}"; \ + done; \ done - oh-installfiles @@ -1,6 +1,7 @@ gcc-defaults (1.1) trunk * Update Maintainer. + * Drop use of opkhelper. * gcc-defaults-common: New binary package. * Drop gcc-*-*-* -> cpp, g++-*-*-* -> cpp, and g++-*-*-* -> gcc-*-*-* dependencies. @@ -43,8 +43,6 @@ configure_build() mkdir -p "${_pkg}-${PKG_TARGET_ARCH}.pkg" sed "${_ss}" "${_pkg}.pkg.in/control" \ >"${_pkg}-${PKG_TARGET_ARCH}.pkg/control" - sed "${_ss}" "${_pkg}.pkg.in/files" \ - >"${_pkg}-${PKG_TARGET_ARCH}.pkg/files" sed "${_ss}" "${_pkg}.pkg.in/postinst" \ >"${_pkg}-${PKG_TARGET_ARCH}.pkg/postinst" sed "${_ss}" "${_pkg}.pkg.in/prerm" \ @@ -1,2 +1 @@ Maintainer: Patrick McDermott <patrick.mcdermott@libiquity.com> -Build-Depends: opkhelper-3.0 diff --git a/cpp.pkg.in/files b/cpp.pkg.in/files deleted file mode 100644 index 0fd7e3c..0000000 --- a/cpp.pkg.in/files +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/@PKG_TARGET_ARCH@-cpp diff --git a/g++.pkg.in/files b/g++.pkg.in/files deleted file mode 100644 index b5a2cbc..0000000 --- a/g++.pkg.in/files +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/@PKG_TARGET_ARCH@-g++ diff --git a/gcc.pkg.in/files b/gcc.pkg.in/files deleted file mode 100644 index fe8350b..0000000 --- a/gcc.pkg.in/files +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/@PKG_TARGET_ARCH@-gcc |