Skip to content

Commit

Permalink
INS_PREFIX=$TARGETPATH; INS_PREFIX x3
Browse files Browse the repository at this point in the history
  • Loading branch information
sam#gemmi-win10 committed Nov 3, 2023
1 parent 37c5224 commit 384055d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions compile/src/tigervnc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"


# set -u; err if not exist
DEST_DIR="/" #/tmp/xx-install> /
test -z "$TARGETPATH" && export TARGETPATH=/opt/base
DEST_DIR="/" #/tmp/xx-install> /
INS_PREFIX=$TARGETPATH
# rm -rf $LOGS; #avoid deleted @batch-mode
CACHE=$TARGETPATH/../.cache; LOGS=$TARGETPATH/../.logs; mkdir -p $CACHE $LOGS
function down_catfile(){
Expand Down Expand Up @@ -317,7 +318,7 @@ log "Configuring TigerVNC..."
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_PREFIX=$INS_PREFIX \
-DCMAKE_BUILD_TYPE=Release \
-DINSTALL_SYSTEMD_UNITS=OFF \
-DENABLE_NLS=OFF \
Expand All @@ -337,7 +338,7 @@ autoreconf -fiv /tmp/tigervnc/unix/xserver
cd /tmp/tigervnc/unix/xserver && CFLAGS="$CFLAGS -Wno-implicit-function-declaration" ./configure \
--build=$(TARGETPLATFORM= xx-clang --print-target-triple) \
--host=$(xx-clang --print-target-triple) \
--prefix=/usr \
--prefix=$INS_PREFIX \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
--with-xkb-path=${TARGETPATH}/usr/share/X11/xkb \
Expand Down Expand Up @@ -471,7 +472,7 @@ log "Configuring xkbcomp..."
LDFLAGS="-Wl,--as-needed --static -static -Wl,--strip-all -Wl,--start-group -lX11 -lxcb -lXdmcp -lXau -Wl,--end-group" LIBS="$LDFLAGS" ./configure \
--build=$(TARGETPLATFORM= xx-clang --print-target-triple) \
--host=$(xx-clang --print-target-triple) \
--prefix=/usr \
--prefix=$INS_PREFIX \
)

log "Compiling xkbcomp..."
Expand Down

0 comments on commit 384055d

Please sign in to comment.