summaryrefslogtreecommitdiff
path: root/editors/linux-bcompare/files/extra-patch-usr_bin_bcompare_i386
blob: 29a59382a8471b3d14a8c986b84bae032f8ddb33 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
--- usr/bin/bcompare.orig	2020-09-24 21:23:08 UTC
+++ usr/bin/bcompare
@@ -1,17 +1,22 @@
 #!/bin/sh
 
-BC_LIB=/usr/lib/beyondcompare
+LINUXULATOR_LIB=/compat/linux/usr/lib
+
+BC_LIB=/usr/local/lib/beyondcompare
 export BC_LIB
 
+_LD_PRELOAD="$BC_LIB/nosched.so"
+export _LD_PRELOAD
+
 BC_PACKAGE_TYPE=rpm
 export BC_PACKAGE_TYPE
 
 EXEC="$BC_LIB/BCompare"
 
 if [ -n "$LD_LIBRARY_PATH" ]; then
-export LD_LIBRARY_PATH="$BC_LIB:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$BC_LIB:$LD_LIBRARY_PATH:$LINUXULATOR_LIB"
 else
-export LD_LIBRARY_PATH="$BC_LIB"
+export LD_LIBRARY_PATH="$BC_LIB:$LINUXULATOR_LIB"
 fi
 
 #check to see if we have all of the shared libraries.
@@ -44,7 +49,7 @@ while [ "$#" -gt 0 ]; do
    ARGS=$ARGS" \"$1\""
    shift 1
 done
-/bin/bash -c "exec -a $0 $EXEC $ARGS > /dev/null 2>&1" $0
+/usr/bin/env bash -c "exec -a $0 /usr/bin/env LD_PRELOAD=$_LD_PRELOAD $EXEC $ARGS > /dev/null 2>&1" $0
 
 ########################################
 # set exit code / wait on existing instance
@@ -54,4 +59,6 @@ if [ $EXIT = 99 ]; then
 	EXIT=`cat /tmp/BC4_.$$`
 	rm -f /tmp/BC4_.$$
 fi
+[ ! -f bash.core ] || rm -f bash.core
+[ ! -f pgrep.core ] || rm -f pgrep.core
 exit $EXIT