diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-10-08 15:54:28 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-10-08 15:54:28 +0400 |
| commit | 9aba03f367d0aa3b7d6c29a1819c7045698e098f (patch) | |
| tree | 586ec42db9d317da4c3d6d02eb7b75510ab0b8ec | |
| parent | 2c79ecc41eff2da1c2f677217721db279d8a26eb (diff) | |
| download | illumos-packaging-9aba03f367d0aa3b7d6c29a1819c7045698e098f.tar.gz | |
Use variables from env.sh
| -rwxr-xr-x | libc/debian/rules | 60 |
1 files changed, 19 insertions, 41 deletions
diff --git a/libc/debian/rules b/libc/debian/rules index 0ec8367..280b312 100755 --- a/libc/debian/rules +++ b/libc/debian/rules @@ -2,21 +2,6 @@ include /usr/share/dpkg/architecture.mk -ifeq (64,$(DEB_HOST_ARCH_BITS)) -DEB_LIBDIR_32 := /lib32 -DEB_LIBDIR_64 := /lib/$(DEB_HOST_MULTIARCH) -else -DEB_LIBDIR_32 := /lib/$(DEB_HOST_MULTIARCH) -DEB_LIBDIR_64 := /lib64 -endif -DEB_USRLIBDIR_32 := /usr$(DEB_LIBDIR_32) -DEB_USRLIBDIR_64 := /usr$(DEB_LIBDIR_64) - -# Used in libc crypto routings to search crypto modules, -# and in lib/crypt_modules to install modules: -DEB_CRYPT_MODULE_DIR_64 := $(DEB_LIBDIR_64)/security -DEB_CRYPT_MODULE_DIR_32 := $(DEB_LIBDIR_32)/security - # only for testing: #make = -m '/home/sunmake/make -j2 --sun' @@ -91,14 +76,8 @@ unpack: unpack-stamp unpack-stamp: dh_testdir dh_illumos_gate - # Make sure we can use these vars when running dh_illumos_make, - # not only as ./debian/rules build: - echo "export DEB_LIBDIR_32='$(DEB_LIBDIR_32)'" >> illumos-gate/env.sh - echo "export DEB_LIBDIR_64='$(DEB_LIBDIR_64)'" >> illumos-gate/env.sh - echo "export DEB_USRLIBDIR_32='$(DEB_USRLIBDIR_32)'" >> illumos-gate/env.sh - echo "export DEB_USRLIBDIR_64='$(DEB_USRLIBDIR_64)'" >> illumos-gate/env.sh - echo "export DEB_CRYPT_MODULE_DIR_32='$(DEB_CRYPT_MODULE_DIR_32)'" >> illumos-gate/env.sh - echo "export DEB_CRYPT_MODULE_DIR_64='$(DEB_CRYPT_MODULE_DIR_64)'" >> illumos-gate/env.sh + echo 'export DEB_CRYPT_MODULE_DIR_32="$$DEB_LIBDIR_32/security"' >> illumos-gate/env.sh + echo 'export DEB_CRYPT_MODULE_DIR_64="$$DEB_LIBDIR_64/security"' >> illumos-gate/env.sh touch $@ patch: patch-stamp @@ -118,31 +97,30 @@ fix-x-stamp: patch-stamp touch $@ dirs-stamp: - mkdir -p \ - debian/tmp$(DEB_CRYPT_MODULE_DIR_32) \ - debian/tmp$(DEB_CRYPT_MODULE_DIR_64) \ - debian/tmp$(DEB_LIBDIR_32) \ - debian/tmp$(DEB_LIBDIR_64) \ - debian/tmp$(DEB_USRLIBDIR_32) \ - debian/tmp$(DEB_USRLIBDIR_64) \ + . illumos-gate/env.sh; mkdir -p \ + debian/tmp$$DEB_CRYPT_MODULE_DIR_32 \ + debian/tmp$$DEB_CRYPT_MODULE_DIR_64 \ + debian/tmp$$DEB_LIBDIR_32 \ + debian/tmp$$DEB_LIBDIR_64 \ + debian/tmp$$DEB_USRLIBDIR_32 \ + debian/tmp$$DEB_USRLIBDIR_64 \ debian/tmp/etc/default \ - debian/tmp/sbin \ debian/tmp/usr/bin \ - debian/tmp/usr/sbin \ - + debian/tmp/usr/sbin # We are changing soname, but keep links for build time. # These links also will go into libsunXXX-dev packages. # Watch out: libc build-conflicts with other libelf-dev and libavl-dev # implementations, and libsunXXX-dev will do too. - ln -sf $(CURDIR)/debian/tmp$(DEB_LIBDIR_32)/libsunelf.so.1 \ - debian/tmp$(DEB_USRLIBDIR_32)/libelf.so - ln -sf $(CURDIR)/debian/tmp$(DEB_LIBDIR_64)/libsunelf.so.1 \ - debian/tmp$(DEB_USRLIBDIR_64)/libelf.so - ln -sf $(CURDIR)/debian/tmp$(DEB_LIBDIR_32)/libsunavl.so.1 \ - debian/tmp$(DEB_USRLIBDIR_32)/libavl.so - ln -sf $(CURDIR)/debian/tmp$(DEB_LIBDIR_64)/libsunavl.so.1 \ - debian/tmp$(DEB_USRLIBDIR_64)/libavl.so + . illumos-gate/env.sh; \ + ln -sf $(CURDIR)/debian/tmp$$DEB_LIBDIR_32/libsunelf.so.1 \ + debian/tmp$$DEB_USRLIBDIR_32/libelf.so && \ + ln -sf $(CURDIR)/debian/tmp$$DEB_LIBDIR_64/libsunelf.so.1 \ + debian/tmp$$DEB_USRLIBDIR_64/libelf.so && \ + ln -sf $(CURDIR)/debian/tmp$$DEB_LIBDIR_32/libsunavl.so.1 \ + debian/tmp$$DEB_USRLIBDIR_32/libavl.so && \ + ln -sf $(CURDIR)/debian/tmp$$DEB_LIBDIR_64/libsunavl.so.1 \ + debian/tmp$$DEB_USRLIBDIR_64/libavl.so touch $@ |