[gcc-6] 19/401: - s/PWD/CURDIR/
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:47:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.
commit f01baf13780fcfa9ffd81e0491d1f281ed041e34
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Dec 13 14:56:47 2015 +0000
- s/PWD/CURDIR/
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8517 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 2 +-
debian/rules.d/binary-java.mk | 2 +-
debian/rules.defs | 9 ++++-----
debian/rules2 | 32 ++++++++++++++++----------------
4 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2f389de..c258dcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ gcc-6 (6-20151211-2) UNRELEASED; urgency=medium
* Allow unstripped, non-optimized debug builds with setting DEB_BUILD_OPTIONS
including gccdebug.
* Remove obsolete libgccmath packaging support.
- * Define SONAME macros whether the libararies are built or not.
+ * Define SONAME macros whether the libraries are built or not.
-- Matthias Klose <doko at debian.org> Sun, 13 Dec 2015 12:20:23 +0100
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index 79ac00d..ef4eeff 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -336,7 +336,7 @@ $(binary_stamp)-libgcjjar: $(install_stamp)
# ----------------------------------------------------------------------
$(build_javasrc_stamp): $(build_stamp)
- PATH=$(PWD)/bin:$$PATH \
+ PATH=$(CURDIR)/bin:$$PATH \
$(MAKE) -C $(buildlibdir)/libjava src.zip
touch $@
diff --git a/debian/rules.defs b/debian/rules.defs
index abc460d..e6916ec 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -10,11 +10,10 @@ endif
# common vars
SHELL = /bin/bash -e # brace expansion used in rules file
-PWD := $(shell pwd)
-srcdir = $(PWD)/src
-builddir = $(PWD)/build
-builddir_jit = $(PWD)/build-jit
-builddir_hppa64 = $(PWD)/build-hppa64
+srcdir = $(CURDIR)/src
+builddir = $(CURDIR)/build
+builddir_jit = $(CURDIR)/build-jit
+builddir_hppa64 = $(CURDIR)/build-hppa64
stampdir = stamps
distribution := $(shell lsb_release -is)
diff --git a/debian/rules2 b/debian/rules2
index 48f601c..6f726ef 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -37,16 +37,16 @@ else
endif
ifeq ($(locale_data),generate)
- SET_LOCPATH = LOCPATH=$(PWD)/locales
+ SET_LOCPATH = LOCPATH=$(CURDIR)/locales
endif
-SET_PATH = PATH=$(PWD)/bin:/usr/$(libdir)/gcc/bin:$$PATH
+SET_PATH = PATH=$(CURDIR)/bin:/usr/$(libdir)/gcc/bin:$$PATH
ifeq ($(trunk_build),yes)
ifneq (,$(findstring sparc64-linux,$(DEB_TARGET_GNU_TYPE)))
- SET_PATH = PATH=/usr/lib/gcc-snapshot/bin:$(PWD)/bin:/usr/$(libdir)/gcc/bin:$$PATH
+ SET_PATH = PATH=/usr/lib/gcc-snapshot/bin:$(CURDIR)/bin:/usr/$(libdir)/gcc/bin:$$PATH
endif
ifneq (,$(findstring ppc64-linux,$(DEB_TARGET_GNU_TYPE)))
- SET_PATH = PATH=/usr/lib/gcc-snapshot/bin:$(PWD)/bin:/usr/$(libdir)/gcc/bin:$$PATH
+ SET_PATH = PATH=/usr/lib/gcc-snapshot/bin:$(CURDIR)/bin:/usr/$(libdir)/gcc/bin:$$PATH
endif
endif
@@ -1220,13 +1220,13 @@ ifeq ($(build_type),build-native)
cd ../..; \
for i in `find gnu -name \*.java`; do gcj-6 -C $$i -I. -Iexternal/asm/; done; \
gcj-6 -findirect-dispatch -O2 -fmain=gnu.classpath.tools.javah.Main \
- -I. -Iexternal/asm/ `find . -name \*.class` -o $(PWD)/bin/gjavah.real; \
+ -I. -Iexternal/asm/ `find . -name \*.class` -o $(CURDIR)/bin/gjavah.real; \
( \
echo '#!/bin/sh'; \
echo 'export CLASSPATH='`pwd`'$${CLASSPATH:+:$$CLASSPATH}'; \
- echo 'exec $(PWD)/bin/gjavah.real "$$@"'; \
- ) > $(PWD)/bin/gjavah; \
- chmod +x $(PWD)/bin/gjavah; \
+ echo 'exec $(CURDIR)/bin/gjavah.real "$$@"'; \
+ ) > $(CURDIR)/bin/gjavah; \
+ chmod +x $(CURDIR)/bin/gjavah; \
fi
endif
endif
@@ -1273,7 +1273,7 @@ endif
s=`cat status`; rm -f status; \
if [ $$s -ne 0 ] && [ -z "$$NO_CONFIG_LOG_DUMP$$NO_CONFIG_LOG_DUMPS" ]; then \
for log in $$(find $(builddir) -name config.log); do \
- case "$$log" in */prev-*) continue; esac; \
+ case "$$log" in */build/build-*|*/stage1-*|*/prev-*) continue; esac; \
echo LOGFILE START $$log; \
cat $$log; \
echo LOGFILE END $$log; \
@@ -1512,7 +1512,7 @@ $(stampdir)/05-build-html-nosplit: $(build_stamp)
-I $(srcdir)/gcc/p/doc/generated \
-I $(builddir)/gcc \
-I $(buildlibdir)/libquadmath \
- -o $(PWD)/html/$${outname} \
+ -o $(CURDIR)/html/$${outname} \
{}'
touch $@
@@ -2054,7 +2054,7 @@ ifeq ($(with_hppa64),yes)
CC="$(CC)" \
$(CFLAGS_TO_PASS) \
$(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d) \
+ DESTDIR=$(CURDIR)/$(d) \
install
ls -l $(d)/$(PF)/bin
@@ -2099,7 +2099,7 @@ endif
$(MAKE) -C $(builddir) \
$(CFLAGS_TO_PASS) \
$(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d) \
+ DESTDIR=$(CURDIR)/$(d) \
infodir=/$(PF)/share/info \
mandir=/$(PF)/share/man \
install
@@ -2217,7 +2217,7 @@ endif
$(MAKE) -C $(builddir) \
$(CFLAGS_TO_PASS) \
$(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d) \
+ DESTDIR=$(CURDIR)/$(d) \
infodir=/$(PF)/share/info \
mandir=/$(PF)/share/man \
install
@@ -2370,7 +2370,7 @@ $(install_jit_stamp): $(build_jit_stamp) $(install_stamp)
CC="$(CC_FOR_JIT)" \
$(CFLAGS_TO_PASS) \
$(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d)-jit \
+ DESTDIR=$(CURDIR)/$(d)-jit \
install
: # copy files to the standard build
@@ -2395,7 +2395,7 @@ $(install_hppa64_stamp): $(build_hppa64_stamp)
CC="$(CC)" \
$(CFLAGS_TO_PASS) \
$(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d_hppa64) \
+ DESTDIR=$(CURDIR)/$(d_hppa64) \
install
: # remove files not needed
@@ -2434,7 +2434,7 @@ $(install_neon_stamp): $(build_neon_stamp)
CC="$(CC)" \
$(CFLAGS_TO_PASS) \
$(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d_neon) \
+ DESTDIR=$(CURDIR)/$(d_neon) \
install
touch $(install_neon_stamp)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git
More information about the Reproducible-commits
mailing list