[arch-commits] Commit in git/trunk (PKGBUILD fix-git-build-python.patch)

Dan McGee dan at archlinux.org
Mon Jan 14 22:23:09 UTC 2013


    Date: Monday, January 14, 2013 @ 17:23:08
  Author: dan
Revision: 175131

upgpkg: git 1.8.1.1-1

Modified:
  git/trunk/PKGBUILD
Deleted:
  git/trunk/fix-git-build-python.patch

----------------------------+
 PKGBUILD                   |   13 +----
 fix-git-build-python.patch |  109 -------------------------------------------
 2 files changed, 5 insertions(+), 117 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-14 17:12:42 UTC (rev 175130)
+++ PKGBUILD	2013-01-14 22:23:08 UTC (rev 175131)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=git
-pkgver=1.8.1
+pkgver=1.8.1.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -28,13 +28,11 @@
         git-daemon
         git-daemon.conf
         git-daemon at .service
-        git-daemon.socket
-        fix-git-build-python.patch)
+        git-daemon.socket)
 
 build() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 < ../fix-git-build-python.patch
   make prefix=/usr gitexecdir=/usr/lib/git-core \
     CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
     USE_LIBPCRE=1 \
@@ -111,10 +109,9 @@
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('a2c6f4404c5e432b47474d246ca83c7e'
-         '8da825142aed9f37f80ad67164990373'
+md5sums=('2bf7fd005ecf2e0a311b849e6add7994'
+         '4ac4ea5a72ec96ac24b7d6fba9ad1277'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78'
          '042524f942785772d7bd52a1f02fe5ae'
-         'f67869315c2cc112e076f0c73f248002'
-         '7fd505fdcd0cd0223e5b8ad641090de8')
+         'f67869315c2cc112e076f0c73f248002')

Deleted: fix-git-build-python.patch
===================================================================
--- fix-git-build-python.patch	2013-01-14 17:12:42 UTC (rev 175130)
+++ fix-git-build-python.patch	2013-01-14 22:23:08 UTC (rev 175131)
@@ -1,109 +0,0 @@
-Date: Wed, 2 Jan 2013 03:59:35 -0500
-From: Jeff King <peff at peff.net>
-To: Junio C Hamano <gitster at pobox.com>
-Cc: Dan McGee <dan at archlinux.org>, GIT Mailing-list <git at vger.kernel.org>,
-	Florian Achleitner <florian.achleitner.2.6.31 at gmail.com>,
-	David Michael Barr <b at rr-dav.id.au>,
-	"Eric S. Raymond" <esr at thyrsus.com>
-Subject: Re: Test failures with python versions when building git 1.8.1
-Message-ID: <20130102085935.GB9328 at sigill.intra.peff.net>
-References: <CAEik5nOqge8ix4WGf-h+0Dmz1CanH_XtQdB-CxvPsggSu1-LzQ at mail.gmail.com>
- <7va9ss5fhq.fsf at alter.siamese.dyndns.org>
- <20130102065345.GA8685 at sigill.intra.peff.net>
- <7v1ue459yh.fsf at alter.siamese.dyndns.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Disposition: inline
-In-Reply-To: <7v1ue459yh.fsf at alter.siamese.dyndns.org>
-
-On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
-
-> Jeff King <peff at peff.net> writes:
-> 
-> > [1] This symlink is doubly wrong, because any use of symbolic links
-> >     in the test scripts needs to depend on the SYMLINKS prereq, and this
-> >     does not.
-> 
-> Yeah, I think we have discussed this once already in
-> 
-> http://thread.gmane.org/gmane.comp.version-control.git/210688/focus=210714
-
-Thanks for the pointer; it looks like nothing productive came of the
-earlier discussion. To give a hat trick of failure to this line of code,
-I notice that the existing code also does not properly put quotes around
-$GIT_BUILD_DIR.
-
-> > [2] In both the current code and what I showed above, the test scripts
-> >     depend on things in contrib/. This is probably a bad idea in
-> >     general, as the quality of what goes into contrib is not as closely
-> >     watched (especially with respect to things like portability).
-> >     Certainly I would not have known to look more carefully at a patch
-> >     to contrib/svn-fe for breakage to the test suite.
-> 
-> As long as such tests are made skippable with appropriate
-> prerequisites, I do not think it is bad to have their tests in t/; I
-> would say it is rather better than having them in contrib/ and leave
-> it not run by anybody, which happened to some of the stuff in
-> contrib/ already.
-
-Good point. While my sense of decorum wants to keep contrib totally
-split out, from a practical point of view, it is better to have more
-people run the tests and report failures than not.
-
-Whether we end up doing something with contrib and tests or not, the
-patch below gives a minimal fix in the meantime. Dan, does it fix your
-problem?
-
--- >8 --
-Subject: [PATCH] t9020: don't run python from $PATH
-
-In t9020, we symlink in a python script from contrib to help
-with the testing. However, we don't munge its #!-line, which
-means we may run the wrong python (we want the one in
-PYTHON_PATH). On top of this, we use a symlink without
-checking the SYMLINKS prereq, and we fail to properly quote
-GIT_BUILD_DIR, which may have spaces.
-
-Instead of symlinking, let's just write a small script which
-will feed the contrib script to PYTHON_PATH. To avoid
-quoting issues, we just export the variables the script
-needs to run.
-
-Signed-off-by: Jeff King <peff at peff.net>
----
- t/t9020-remote-svn.sh | 5 ++++-
- t/test-lib.sh         | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
-index 4f2dfe0..416623b 100755
---- a/t/t9020-remote-svn.sh
-+++ b/t/t9020-remote-svn.sh
-@@ -14,7 +14,10 @@ export PATH="$HOME:$PATH"
- 
- # We override svnrdump by placing a symlink to the svnrdump-emulator in .
- export PATH="$HOME:$PATH"
--ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"
-+export GIT_BUILD_DIR
-+write_script svnrdump <<\EOF
-+exec "$PYTHON_PATH" "$GIT_BUILD_DIR"/contrib/svn-fe/svnrdump_sim.py "$@"
-+EOF
- 
- init_git () {
- 	rm -fr .git &&
-diff --git a/t/test-lib.sh b/t/test-lib.sh
-index f50f834..c17db19 100644
---- a/t/test-lib.sh
-+++ b/t/test-lib.sh
-@@ -45,7 +45,7 @@ fi
- fi
- 
- . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
--export PERL_PATH SHELL_PATH
-+export PERL_PATH SHELL_PATH PYTHON_PATH
- 
- # if --tee was passed, write the output not only to the terminal, but
- # additionally to the file test-results/$BASENAME.out, too.
--- 
-1.8.1.rc3.4.gf3a2f57
-




More information about the arch-commits mailing list