summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2019-09-17 19:16:12 +0200
committerIsmael Luceno2019-09-17 19:16:12 +0200
commit3ba6eb468a49eb9cfee599084aeaaaafac1c359e (patch)
tree634df002cd206d440293202d51514dd3a14d865e
parent14a1c56c4b031d81f2b0c89572addcd51cd9ae3a (diff)
google-chrome-bin: Fix installation
Remove -a flag for cp, it fails inside castfs for some reason. Also, remove rare symlinks, as those aren't used by Chrome anymore.
-rw-r--r--bin-http/google-chrome-bin/HISTORY1
-rwxr-xr-xbin-http/google-chrome-bin/INSTALL20
2 files changed, 3 insertions, 18 deletions
diff --git a/bin-http/google-chrome-bin/HISTORY b/bin-http/google-chrome-bin/HISTORY
index 92ab315..3a54dd4 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,6 +1,7 @@
2019-09-17 Ismael Luceno <ismael@sourcemage.org>
* DEPENDS: updated dependencies
* PRE_BUILD: simplified extraction
+ * INSTALL: fixed installation; no more rare symlinks
2019-07-08 Eric Sandall <sandalle@sourcemage.org>
* Set 64-bit for EM64T as well.
diff --git a/bin-http/google-chrome-bin/INSTALL b/bin-http/google-chrome-bin/INSTALL
index f8d63ec..310978f 100755
--- a/bin-http/google-chrome-bin/INSTALL
+++ b/bin-http/google-chrome-bin/INSTALL
@@ -1,6 +1,6 @@
install -d -m 0755 $INSTALL_ROOT/opt/google &&
-cp -arv $SOURCE_DIRECTORY/opt/google/* $INSTALL_ROOT/opt/google &&
-cp -arv $SOURCE_DIRECTORY/usr $INSTALL_ROOT/
+cp -rv $SOURCE_DIRECTORY/opt/google/* $INSTALL_ROOT/opt/google &&
+cp -rv $SOURCE_DIRECTORY/usr $INSTALL_ROOT/ &&
if [[ -d $INSTALL_ROOT/usr/lib/xulrunner/plugins ]]
then
@@ -9,22 +9,6 @@ then
fi &&
#
-# Google Chrome links to weird .so.1d and .so.0d
-# http://code.google.com/p/chromium/issues/detail?id=13425
-#
-for lib in nss3 nssutil3 smime3 ssl3
-do
- ln -s $TRACK_ROOT/usr/lib/lib$lib.so \
- $INSTALL_ROOT/opt/google/chrome/lib$lib.so.1d
-done &&
-
-for lib in plds4 plc4 nspr4
-do
- ln -s $TRACK_ROOT/usr/lib/lib$lib.so \
- $INSTALL_ROOT/opt/google/chrome/lib$lib.so.0d
-done
-
-#
# Create lib64 symlink
#
[ -e /lib64 ] || ln -s lib $INSTALL_ROOT/lib64