From e05af6949000bdf66b28b56ba956d8bac22792c2 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Mon, 22 Apr 2013 13:02:24 -0400 Subject: build: Use only lowercase letters in local macros. --- (limited to 'build') diff --git a/build b/build index 190fc26..bab567d 100755 --- a/build +++ b/build @@ -1,10 +1,10 @@ #!/usr/bin/make -f -BASE_VERSION = $$(printf '%s\n' '$(OPK_SOURCE)' | sed 's/^gcc-//') +base_version = $$(printf '%s\n' '$(OPK_SOURCE)' | sed 's/^gcc-//') -COMMON_OPTS = \ +common_opts = \ --with-pkgversion='GCC for ProteanOS' \ - --program-suffix="-$(BASE_VERSION)" \ + --program-suffix="-$(base_version)" \ --enable-linker-build-id \ --with-system-zlib \ --disable-multilib \ @@ -13,14 +13,14 @@ COMMON_OPTS = \ --with-sysroot="$${OPK_SYSROOT:-/}" \ --enable-clocale=gnu -FULL_OPTS = \ - $(COMMON_OPTS) \ +full_opts = \ + $(common_opts) \ --enable-shared \ --enable-threads=posix \ --enable-languages=c,c++ -BOOTSTRAP1_OPTS = \ - $(COMMON_OPTS) \ +bootstrap1_opts = \ + $(common_opts) \ --without-headers \ --with-newlib \ --disable-shared \ @@ -36,15 +36,15 @@ nop: configure: if [ 'x$(OPK_HOST_PLAT)' = 'xbootstrap1' ]; then \ oh-autoconfigure -B gcc-build -- \ - $(BOOTSTRAP1_OPTS); \ + $(bootstrap1_opts); \ else \ oh-autoconfigure -B gcc-build -- \ - $(FULL_OPTS); \ + $(full_opts); \ fi touch $@ build: configure - libsubdir="/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)" && \ + libsubdir="/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)" && \ oh-autobuild -B gcc-build -T bootstrap-lean -- -j $${JOBS:-1} \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ @@ -64,7 +64,7 @@ install: build # is specified. # See also: . # TODO: Replace $(OPK_HOST_ARCH) with the target arch. - libsubdir="/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)" && \ + libsubdir="/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)" && \ oh-autoinstall -B gcc-build -T install -- \ gxx_include_dir=/usr/include/c++-4.7 \ host_installdir=/usr/include/$(OPK_HOST_ARCH)/c++-4.7/bits \ @@ -75,18 +75,18 @@ install: build toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) \ MULTIOSDIR= # Change the target architecture prefix of files in /usr/bin. - rm -f dest/usr/bin/*-gcc-$(BASE_VERSION).* + rm -f dest/usr/bin/*-gcc-$(base_version).* for f in c++ g++ gcc gcc-ar gcc-nm gcc-ranlib; do \ - rm -f dest/usr/bin/$${f}-$(BASE_VERSION); \ - mv dest/usr/bin/*-$${f}-$(BASE_VERSION) \ + rm -f dest/usr/bin/$${f}-$(base_version); \ + mv dest/usr/bin/*-$${f}-$(base_version) \ dest/usr/bin/$(OPK_HOST_ARCH)-$$(printf '%s' \ - dest/usr/bin/*-$${f}-$(BASE_VERSION) | \ + dest/usr/bin/*-$${f}-$(base_version) | \ sed "s/^.*-\($${f}\)/\1/"); \ ln -sf $(OPK_HOST_ARCH)-$$(printf '%s' \ - dest/usr/bin/*-$${f}-$(BASE_VERSION) | \ + dest/usr/bin/*-$${f}-$(base_version) | \ sed "s/^.*-\($${f}\)/\1/") \ dest/usr/bin/$$(printf '%s' \ - dest/usr/bin/*-$${f}-$(BASE_VERSION) | \ + dest/usr/bin/*-$${f}-$(base_version) | \ sed "s/^.*-\($${f}\)/\1/"); \ done # Remove the internal libiberty.a. @@ -94,68 +94,68 @@ install: build # Move libstdc++.so link. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libstdc++.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libstdc++.so.6 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libstdc++.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libstdc++.so # Move libstdc++.a and libsupc++.a. mv dest/usr/lib/$(OPK_HOST_ARCH)/libstdc++.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ mv dest/usr/lib/$(OPK_HOST_ARCH)/libsupc++.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ # Move libmudflap.so and libmudflapth.so links. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libmudflap.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libmudflap.so.0 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libmudflap.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libmudflap.so rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libmudflapth.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libmudflapth.so.0 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libmudflapth.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libmudflapth.so # Move libmudflap.a and libmudflapth.a. mv dest/usr/lib/$(OPK_HOST_ARCH)/libmudflap.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ mv dest/usr/lib/$(OPK_HOST_ARCH)/libmudflapth.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ # Move libssp.so link. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libssp.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libssp.so.0 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libssp.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libssp.so # Move libssp.a and libssp_nonshared.a. mv dest/usr/lib/$(OPK_HOST_ARCH)/libssp.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ mv dest/usr/lib/$(OPK_HOST_ARCH)/libssp_nonshared.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ # Move libgcc_s.so.1 under /lib. mkdir -p dest/lib/$(OPK_HOST_ARCH) mv dest/usr/lib/$(OPK_HOST_ARCH)/libgcc_s.so.1 dest/lib/$(OPK_HOST_ARCH) # Move libgcc_s.so link. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libgcc_s.so ln -sf /lib/$(OPK_HOST_ARCH)/libgcc_s.so.1 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libgcc_s.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libgcc_s.so # Move libquadmath.so link. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libquadmath.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libquadmath.so.0 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libquadmath.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libquadmath.so # Move libquadmath.a. mv dest/usr/lib/$(OPK_HOST_ARCH)/libquadmath.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ # Move libgomp.so link. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libgomp.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libgomp.so.1 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libgomp.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libgomp.so # Move libgomp.a. mv dest/usr/lib/$(OPK_HOST_ARCH)/libgomp.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ # Move libitm.so link. rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libitm.so ln -sf /usr/lib/$(OPK_HOST_ARCH)/libitm.so.1 \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/libitm.so + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/libitm.so # Move libitm.a. mv dest/usr/lib/$(OPK_HOST_ARCH)/libitm.a \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/ # Remove libtool archives. rm -f \ dest/usr/lib/$(OPK_HOST_ARCH)/libmudflap.la \ dest/usr/lib/$(OPK_HOST_ARCH)/libmudflapth.la \ dest/usr/lib/$(OPK_HOST_ARCH)/libssp.la \ dest/usr/lib/$(OPK_HOST_ARCH)/libssp_nonshared.la \ - dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/liblto_plugin.la \ + dest/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)/liblto_plugin.la \ dest/usr/lib/$(OPK_HOST_ARCH)/libquadmath.la \ dest/usr/lib/$(OPK_HOST_ARCH)/libgomp.la \ dest/usr/lib/$(OPK_HOST_ARCH)/libitm.la \ -- cgit v0.9.1