summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2014-12-03 12:09:39 +0000
committerJay Freeman <saurik@saurik.com>2014-12-03 12:09:39 +0000
commitfd6a378940fb238622b7e8bb39cb4b1bb2171912 (patch)
treea4d0c8794e1f18ccbc2139a691d56c446c64da16
parent41564b0496dc4efab215038a79df901f8797db06 (diff)
The anti-hardlink patch is unneccessary.
git-svn-id: http://svn.telesphoreo.org/trunk@802 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--data/git/make.sh2
-rw-r--r--data/git/symlink.diff50
2 files changed, 1 insertions, 51 deletions
diff --git a/data/git/make.sh b/data/git/make.sh
index 3dc1c30d8..ea013a4c0 100644
--- a/data/git/make.sh
+++ b/data/git/make.sh
@@ -2,5 +2,5 @@ pkg:setup
export PATH=/apl/tel/path:$PATH
pkg:configure ac_cv_c_c99_format=yes ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=yes --without-tcltk
make
-pkg:install
+pkg:install NO_INSTALL_HARDLINKS=yes
pkg: rm -f /usr/lib/perl/5.10.1/perllocal.pod
diff --git a/data/git/symlink.diff b/data/git/symlink.diff
deleted file mode 100644
index 87e4b5b47..000000000
--- a/data/git/symlink.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru git-2.2.0/Makefile git-2.2.0+iPhone/Makefile
---- git-2.2.0/Makefile 2014-11-26 22:39:03.000000000 +0000
-+++ git-2.2.0+iPhone/Makefile 2014-12-03 11:56:31.000000000 +0000
-@@ -1628,7 +1628,6 @@
-
- $(BUILT_INS): git$X
- $(QUIET_BUILT_IN)$(RM) $@ && \
-- ln $< $@ 2>/dev/null || \
- ln -s $< $@ 2>/dev/null || \
- cp $< $@
-
-@@ -1912,7 +1911,6 @@
-
- $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
- $(QUIET_LNCP)$(RM) $@ && \
-- ln $< $@ 2>/dev/null || \
- ln -s $< $@ 2>/dev/null || \
- cp $< $@
-
-@@ -2219,21 +2217,19 @@
- for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
- $(RM) "$$execdir/$$p" && \
- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
-- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
-+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
- cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
- done; \
- } && \
- for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
- $(RM) "$$bindir/$$p" && \
- test -z "$(NO_INSTALL_HARDLINKS)" && \
-- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
- ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
- cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
- done && \
- for p in $(BUILT_INS); do \
- $(RM) "$$execdir/$$p" && \
- test -z "$(NO_INSTALL_HARDLINKS)" && \
-- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
- ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
- cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
- done && \
-@@ -2241,7 +2237,6 @@
- for p in $$remote_curl_aliases; do \
- $(RM) "$$execdir/$$p" && \
- test -z "$(NO_INSTALL_HARDLINKS)" && \
-- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
- ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
- cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
- done && \