tree: fix (thanks to @wjz304)

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

.github/workflows/build.yml

@@ -1,42 +1,26 @@
+#
+# Copyright (C) 2023 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
+#
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
+
 name: build
 
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "format %y.%-m.$i or auto"
+      tag:
+        description: "tag"
         required: false
         type: string
 
 jobs:
   build:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - version: 7.1 
-            platform: apollolake
-          - version: 7.1
-            platform: broadwell
-          - version: 7.1 
-            platform: broadwellnk
-          - version: 7.1 
-            platform: broadwellnkv2
-          - version: 7.1
-            platform: denverton
-          - version: 7.1
-            platform: epyc7002
-          - version: 7.1 
-            platform: geminilake
-          - version: 7.1 
-            platform: purley
-          - version: 7.1
-            platform: r1000
-          - version: 7.1
-            platform: v1000
-          #- version: 7.1
-          #  platform: kvmx64
-
-    runs-on: ubuntu-latest
+        target: [x64-7.1, aarch64-7.1]
 
     steps:
     - name: Checkout
@@ -48,57 +32,36 @@ jobs:
         git config --global user.name "AuxXxilium"
         sudo timedatectl set-timezone "Europe/Berlin"
 
-        sudo apt update
-        sudo apt install -y moreutils
-
-    - name: Calculate Version
-      run: |
-        # Calculate Version
-        VERSION=""
-        if [ -n "${{ inputs.version }}" ]; then
-          VERSION="${{ inputs.version }}"
-        else
-          LATEST_TAG="`curl -skL "https://api.github.com/repos/${{ github.repository }}/releases/latest" | jq -r ".tag_name" 2>/dev/null`"
-          if [[ -n "${LATEST_TAG}" && "`echo ${LATEST_TAG} | cut -d '.' -f 1,2`" = "`date +'%y.%-m.%-d'`" ]]; then  # format %y.%-m.$i
-            VERSION="`echo ${LATEST_TAG} | awk -F '.' '{$3=$3+1}1' OFS='.'`"
-          else
-            VERSION="`date +'%y.%-m.%-d'`"
-          fi
-        fi
-
-        if [ -n "${VERSION}" ]; then
-          # Modify Source File
-          echo "Version: ${VERSION}"
-          echo "VERSION=${VERSION}" >> $GITHUB_ENV
-        fi
-
-    - name: Checkout Synology Community Source and Docker Image
+    - name: Checkout SynoCommunity Source and Docker Image
       run: |
         docker pull ghcr.io/synocommunity/spksrc
         git clone --depth=1 https://github.com/SynoCommunity/spksrc.git
-        cp -rf cross/* spksrc/cross
-        cp -rf native/* spksrc/native
-        cp -rf spk/* spksrc/spk
+        cp -rf src/* spksrc
 
     - name: Build Package
       run: |
         ROOT_PATH="${{ github.workspace }}"
-        MAKE_ARCH="arch-${{ matrix.platform }}-${{ matrix.version }}"
+        MAKE_ARCH="arch-${{ matrix.target }}"
         docker run -v ${ROOT_PATH}/spksrc:/spksrc -w /spksrc/spk/open-vm-tools ghcr.io/synocommunity/spksrc make ${MAKE_ARCH}
 
     - name: Upload to Artifacts
-      if: success() && env.VERSION == ''
+      if: inputs.tag == ''
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.platform }}-${{ matrix.version }}
+        name: ${{ matrix.target }}
         path: |
           spksrc/packages/*.spk
         retention-days: 5
 
     - name: Release
-      if: success() && env.VERSION != ''
-      uses: ncipollo/release-action@v1
+      if: inputs.tag != ''
+      uses: softprops/action-gh-release@v2
+      body: |
+        ### DSM 7.0 / 7.1 / 7.2
+
+        - Perform code repair using SSH connection
+        
+        `sudo sed -i 's/package/root/g' /var/packages/open-vm-tools/conf/privilege`
       with:
-        tag: ${{ env.VERSION }}
-        allowUpdates: true
-        artifacts: spksrc/packages/*.spk
+        tag_name: ${{ inputs.tag }}
+        files: spksrc/packages/*.spk

.gitignore

@@ -1 +1 @@
-workspace.code-workspace
+spksrc/

cross/libiconv/Makefile

@@ -1,22 +0,0 @@
-PKG_NAME = libiconv
-PKG_VERS = 1.17
-PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://ftp.gnu.org/pub/gnu/libiconv
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-
-DEPENDS =
-
-HOMEPAGE = https://www.gnu.org/software/libiconv
-COMMENT  = GNU libiconv provides an implementation of the iconv() function and the iconv program for character set conversion. For use on systems which don't have one, or whose implementation cannot convert from/to Unicode. 
-LICENSE  = GNU GPLv3
-
-GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --disable-static
-ADDITIONAL_CFLAGS = -O
-
-include ../../mk/spksrc.cross-cc.mk
-
-.PHONY: libiconv_install
-libiconv_install:
-	$(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) PREFIX=$(INSTALL_PREFIX)

cross/libiconv/PLIST

@@ -1,7 +0,0 @@
-bin:bin/iconv
-lnk:lib/libcharset.so
-lnk:lib/libcharset.so.1
-lib:lib/libcharset.so.1.0.0
-lnk:lib/libiconv.so
-lnk:lib/libiconv.so.2
-lib:lib/libiconv.so.2.6.1

cross/libiconv/digests

@@ -1,3 +0,0 @@
-libiconv-1.17.tar.gz SHA1 409a6a8c07280e02cc33b65ae871311f4b33077b
-libiconv-1.17.tar.gz SHA256 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313
-libiconv-1.17.tar.gz MD5 d718cd5a59438be666d1575855be72c3

native/icu/work-native/install/usr/local/lib/icu/Makefile.inc

@@ -1,292 +0,0 @@
-# Copyright (C) 2016 and later: Unicode, Inc. and others.
-# License & terms of use: http://www.unicode.org/copyright.html
-## -*-makefile-*-
-#******************************************************************************
-#   Copyright (C) 1999-2014, International Business Machines
-#   Corporation and others.  All Rights Reserved.
-#******************************************************************************
-# This Makefile.inc is designed to be included into projects which make use
-# of the ICU.
-
-# CONTENTS OF THIS FILE
-# 1). Base configuration information and linkage
-# 2). Variables giving access to ICU tools
-# 3). Host information
-# 4). Compiler flags and settings 
-# 5). Data Packaging directives
-# 6). Include of platform make fragment (mh-* file)
-
-##################################################################
-##################################################################
-#
-#       *1*  base configuration information and linkage
-#
-##################################################################
-# The PREFIX is the base of where ICU is installed.
-# Inside this directory you should find  bin, lib, include/unicode, 
-# etc.  If ICU is not installed in this directory, you must change the
-# following line.  There should exist $(prefix)/include/unicode/utypes.h
-# for example.
-prefix = /usr/local
-exec_prefix = ${prefix}
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-bindir = ${exec_prefix}/bin
-datarootdir = ${prefix}/share
-datadir = ${datarootdir}
-sbindir = ${exec_prefix}/sbin
-
-# about the ICU version
-VERSION = 65.1
-UNICODE_VERSION = 12.1
-
-# The prefix for ICU libraries, normally 'icu'
-ICUPREFIX = icu
-PACKAGE = icu
-LIBICU = lib$(ICUPREFIX)
-
-# Static library prefix and file extension
-STATIC_PREFIX = s
-LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
-A = a
-
-# Suffix at the end of libraries. Usually empty.
-ICULIBSUFFIX = 
-# ICULIBSUFFIX_VERSION  is non-empty if it is to contain a library
-# version. For example, if it is 21, it means libraries are named
-# libicuuc21.so for example.
-
-# rpath links a library search path right into the binaries.
-## mh-files MUST NOT override RPATHLDFLAGS unless they provide
-## equivalent '#SH#' lines for icu-config fixup
-ENABLE_RPATH = NO
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-
-#SH## icu-config version of above 'if':
-#SH#case "x$ENABLE_RPATH" in 
-#SH#     x[yY]*)
-#SH# 	ENABLE_RPATH=YES
-#SH# 	RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}"
-#SH# 	;;
-#SH#
-#SH#     x[nN]*)
-#SH# 	ENABLE_RPATH=NO
-#SH# 	RPATHLDFLAGS=""
-#SH# 	;;
-#SH#
-#SH#     x)
-#SH# 	ENABLE_RPATH=NO
-#SH# 	RPATHLDFLAGS=""
-#SH# 	;;
-#SH#
-#SH#     *)
-#SH# 	echo $0: Unknown --enable-rpath value ${ENABLE_RPATH} 1>&2
-#SH# 	exit 3
-#SH# 	;;
-#SH#esac
-
-# Name flexibility for the library naming scheme.  Any modifications should
-# be made in the mh- file for the specific platform.
-DATA_STUBNAME = data
-COMMON_STUBNAME = uc
-I18N_STUBNAME = i18n
-LAYOUTEX_STUBNAME = lx
-IO_STUBNAME = io
-TOOLUTIL_STUBNAME = tu
-CTESTFW_STUBNAME = test
- 
-
-
-### To link your application with ICU:
-# 1. use LDFLAGS, CFLAGS, etc from above
-# 2. link with $(ICULIBS)
-# 3. optionally, add one or more of:
-#    - $(ICULIBS_I18N)    - i18n library, formatting, etc.
-#    - $(ICULIBS_ICUIO)   - ICU stdio equivalent library
-
-ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_DATA   = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_I18N   = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_BASE = -L$(libdir)
-
-# for icu-config to test with
-ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
-ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
-
-# ICULIBS is the set of libraries your application should link
-# with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
-ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
-
-# Proper echo newline handling is needed in icu-config
-ECHO_N=-n
-ECHO_C=
-# Not currently being used but good to have for proper tab handling
-ECHO_T=
-
-##################################################################
-##################################################################
-#
-#       *2*  access to ICU tools
-#
-##################################################################
-# Environment variable to set a runtime search path
-#   (Overridden when necessary in -mh files)
-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
-
-# Versioned target for a shared library
-FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
-MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
-
-# Access to important ICU tools.
-# Use as follows:  $(INVOKE) $(GENRB) arguments .. 
-INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
-GENCCODE = $(sbindir)/genccode
-ICUPKG   = $(sbindir)/icupkg
-GENCMN   = $(sbindir)/gencmn
-GENRB    = $(bindir)/genrb
-PKGDATA  = $(bindir)/pkgdata
-
-# moved here because of dependencies
-pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
-pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
-
-##################################################################
-##################################################################
-#
-#       *3*  Information about the host
-#
-##################################################################
-
-# Information about the host that 'configure' was run on.
-host = x86_64-pc-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_vendor = pc
-host_os = linux-gnu
-# Our platform canonical name (as determined by configure)
-# this is a #define value (i.e. U_XXXX or XXXX)
-platform = U_LINUX
-
-##################################################################
-##################################################################
-#
-#       *4*  compiler flags and misc. options
-#
-##################################################################
-AR = ar
-# initial tab keeps it out of the shell version.
-	ARFLAGS :=  $(ARFLAGS)
-#SH#ARFLAGS=" ${ARFLAGS}"
-CC = gcc
-CPP = gcc -E
-CFLAGS =  
-CPPFLAGS =  -I$(prefix)/include
-CXXFLAGS =  -std=c++11
-CXX = g++
-DEFAULT_MODE = static
-DEFS = -DPACKAGE_NAME=\"ICU\" -DPACKAGE_TARNAME=\"International\ Components\ for\ Unicode\" -DPACKAGE_VERSION=\"65.1\" -DPACKAGE_STRING=\"ICU\ 65.1\" -DPACKAGE_BUGREPORT=\"http://icu-project.org/bugs\" -DPACKAGE_URL=\"http://icu-project.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DHAVE_LIBM=1 -DHAVE_ELF_H=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LIBPTHREAD=1 -DHAVE_INTTYPES_H=1 -DHAVE_DIRENT_H=1 -DHAVE_WCHAR_H=1 -DSIZEOF_WCHAR_T=4 
-# use a consistent INSTALL 
-INSTALL  =  $(SHELL) $(pkgdatadir)/install-sh -c
-INSTALL_DATA  =  ${INSTALL} -m 644
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM  =  ${INSTALL}
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-LDFLAGS = $(RPATHLDFLAGS)
-LIBS = -lpthread -lm  
-LIB_M = 
-LIB_VERSION = 65.1
-LIB_VERSION_MAJOR = 65
-MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs
-RANLIB = ranlib
-RMV = rm -rf
-SHELL = /bin/bash
-SHLIB.c=      $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
-SHLIB.cc=     $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
-U_IS_BIG_ENDIAN = 0
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-oldincludedir = /usr/include
-program_transform_name = s,x,x,
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-INSTALL-L = ${INSTALL_DATA}
-
-# for derivative builds - don't bother with VERBOSE/NONVERBOSE SILENT_COMPILE
-SILENT_COMPILE=$(1)  #M#
-ICU_MSG=@echo "   $(1)	"  #M#
-
-##################################################################
-##################################################################
-#
-#       *5* packaging options and directories
-#
-##################################################################
-
-
-# The basename of the ICU data file (i.e. icudt21b )
-ICUDATA_CHAR = l
-ICUDATA_NAME = icudt65l
-
-# Defaults for pkgdata's mode and directories
-# The default data dir changes depending on what packaging mode 
-# is being used
-ifeq ($(strip $(PKGDATA_MODE)),)
-#SH# if [ "x$PKGDATA_MODE" = "x" ];
-#SH# then
-PKGDATA_MODE=static
-#SH# fi
-endif
-
-#SH# case "$PKGDATA_MODE" in
-ifeq ($(PKGDATA_MODE),common)
-#SH# common)
-ICUDATA_DIR = $(pkgdatadir)
-ICUPKGDATA_DIR = $(ICUDATA_DIR)
-#SH# ;;
-else
-ifeq ($(PKGDATA_MODE),dll)
-#SH# dll)
-ICUDATA_DIR = $(pkgdatadir)
-ICUPKGDATA_DIR = $(libdir)
-#SH# ;;
-else
-#SH# *)
-ICUDATA_DIR = $(pkgdatadir)
-ICUPKGDATA_DIR = $(ICUDATA_DIR)
-#SH# ;;
-endif
-endif
-
-#SH# esac
-
-GENCCODE_ASSEMBLY = -a gcc
-
-##################################################################
-##################################################################
-#
-#       *6* Inclusion of platform make fragment (mh-* file)
-#
-##################################################################
-# The mh- file ("make fragment") for the platform is included here. 
-# It may override the above settings.
-# It is put last so that the mh-file can override anything.
-# The selfcheck is just a sanity check that this makefile is
-# parseable. The mh fragment is only included if this does not occur.
-
-ifeq (selfcheck,$(MAKECMDGOALS)) #M#
-selfcheck: #M#
-	@echo passed #M#
-else #M#
-include $(pkgdatadir)/config/mh-linux
-endif #M#
-

native/icu/work-native/install/usr/local/lib/icu/current/Makefile.inc

@@ -1,292 +0,0 @@
-# Copyright (C) 2016 and later: Unicode, Inc. and others.
-# License & terms of use: http://www.unicode.org/copyright.html
-## -*-makefile-*-
-#******************************************************************************
-#   Copyright (C) 1999-2014, International Business Machines
-#   Corporation and others.  All Rights Reserved.
-#******************************************************************************
-# This Makefile.inc is designed to be included into projects which make use
-# of the ICU.
-
-# CONTENTS OF THIS FILE
-# 1). Base configuration information and linkage
-# 2). Variables giving access to ICU tools
-# 3). Host information
-# 4). Compiler flags and settings 
-# 5). Data Packaging directives
-# 6). Include of platform make fragment (mh-* file)
-
-##################################################################
-##################################################################
-#
-#       *1*  base configuration information and linkage
-#
-##################################################################
-# The PREFIX is the base of where ICU is installed.
-# Inside this directory you should find  bin, lib, include/unicode, 
-# etc.  If ICU is not installed in this directory, you must change the
-# following line.  There should exist $(prefix)/include/unicode/utypes.h
-# for example.
-prefix = /usr/local
-exec_prefix = ${prefix}
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-bindir = ${exec_prefix}/bin
-datarootdir = ${prefix}/share
-datadir = ${datarootdir}
-sbindir = ${exec_prefix}/sbin
-
-# about the ICU version
-VERSION = 65.1
-UNICODE_VERSION = 12.1
-
-# The prefix for ICU libraries, normally 'icu'
-ICUPREFIX = icu
-PACKAGE = icu
-LIBICU = lib$(ICUPREFIX)
-
-# Static library prefix and file extension
-STATIC_PREFIX = s
-LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
-A = a
-
-# Suffix at the end of libraries. Usually empty.
-ICULIBSUFFIX = 
-# ICULIBSUFFIX_VERSION  is non-empty if it is to contain a library
-# version. For example, if it is 21, it means libraries are named
-# libicuuc21.so for example.
-
-# rpath links a library search path right into the binaries.
-## mh-files MUST NOT override RPATHLDFLAGS unless they provide
-## equivalent '#SH#' lines for icu-config fixup
-ENABLE_RPATH = NO
-ifeq ($(ENABLE_RPATH),YES)
-RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-endif
-
-#SH## icu-config version of above 'if':
-#SH#case "x$ENABLE_RPATH" in 
-#SH#     x[yY]*)
-#SH# 	ENABLE_RPATH=YES
-#SH# 	RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}"
-#SH# 	;;
-#SH#
-#SH#     x[nN]*)
-#SH# 	ENABLE_RPATH=NO
-#SH# 	RPATHLDFLAGS=""
-#SH# 	;;
-#SH#
-#SH#     x)
-#SH# 	ENABLE_RPATH=NO
-#SH# 	RPATHLDFLAGS=""
-#SH# 	;;
-#SH#
-#SH#     *)
-#SH# 	echo $0: Unknown --enable-rpath value ${ENABLE_RPATH} 1>&2
-#SH# 	exit 3
-#SH# 	;;
-#SH#esac
-
-# Name flexibility for the library naming scheme.  Any modifications should
-# be made in the mh- file for the specific platform.
-DATA_STUBNAME = data
-COMMON_STUBNAME = uc
-I18N_STUBNAME = i18n
-LAYOUTEX_STUBNAME = lx
-IO_STUBNAME = io
-TOOLUTIL_STUBNAME = tu
-CTESTFW_STUBNAME = test
- 
-
-
-### To link your application with ICU:
-# 1. use LDFLAGS, CFLAGS, etc from above
-# 2. link with $(ICULIBS)
-# 3. optionally, add one or more of:
-#    - $(ICULIBS_I18N)    - i18n library, formatting, etc.
-#    - $(ICULIBS_ICUIO)   - ICU stdio equivalent library
-
-ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_DATA   = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_I18N   = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_BASE = -L$(libdir)
-
-# for icu-config to test with
-ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
-ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
-
-# ICULIBS is the set of libraries your application should link
-# with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
-ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 
-
-# Proper echo newline handling is needed in icu-config
-ECHO_N=-n
-ECHO_C=
-# Not currently being used but good to have for proper tab handling
-ECHO_T=
-
-##################################################################
-##################################################################
-#
-#       *2*  access to ICU tools
-#
-##################################################################
-# Environment variable to set a runtime search path
-#   (Overridden when necessary in -mh files)
-LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH
-
-# Versioned target for a shared library
-FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
-MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
-
-# Access to important ICU tools.
-# Use as follows:  $(INVOKE) $(GENRB) arguments .. 
-INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
-GENCCODE = $(sbindir)/genccode
-ICUPKG   = $(sbindir)/icupkg
-GENCMN   = $(sbindir)/gencmn
-GENRB    = $(bindir)/genrb
-PKGDATA  = $(bindir)/pkgdata
-
-# moved here because of dependencies
-pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
-pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION)
-
-##################################################################
-##################################################################
-#
-#       *3*  Information about the host
-#
-##################################################################
-
-# Information about the host that 'configure' was run on.
-host = x86_64-pc-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_vendor = pc
-host_os = linux-gnu
-# Our platform canonical name (as determined by configure)
-# this is a #define value (i.e. U_XXXX or XXXX)
-platform = U_LINUX
-
-##################################################################
-##################################################################
-#
-#       *4*  compiler flags and misc. options
-#
-##################################################################
-AR = ar
-# initial tab keeps it out of the shell version.
-	ARFLAGS :=  $(ARFLAGS)
-#SH#ARFLAGS=" ${ARFLAGS}"
-CC = gcc
-CPP = gcc -E
-CFLAGS =  
-CPPFLAGS =  -I$(prefix)/include
-CXXFLAGS =  -std=c++11
-CXX = g++
-DEFAULT_MODE = static
-DEFS = -DPACKAGE_NAME=\"ICU\" -DPACKAGE_TARNAME=\"International\ Components\ for\ Unicode\" -DPACKAGE_VERSION=\"65.1\" -DPACKAGE_STRING=\"ICU\ 65.1\" -DPACKAGE_BUGREPORT=\"http://icu-project.org/bugs\" -DPACKAGE_URL=\"http://icu-project.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DHAVE_LIBM=1 -DHAVE_ELF_H=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LIBPTHREAD=1 -DHAVE_INTTYPES_H=1 -DHAVE_DIRENT_H=1 -DHAVE_WCHAR_H=1 -DSIZEOF_WCHAR_T=4 
-# use a consistent INSTALL 
-INSTALL  =  $(SHELL) $(pkgdatadir)/install-sh -c
-INSTALL_DATA  =  ${INSTALL} -m 644
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM  =  ${INSTALL}
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-LDFLAGS = $(RPATHLDFLAGS)
-LIBS = -lpthread -lm  
-LIB_M = 
-LIB_VERSION = 65.1
-LIB_VERSION_MAJOR = 65
-MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs
-RANLIB = ranlib
-RMV = rm -rf
-SHELL = /bin/bash
-SHLIB.c=      $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared
-SHLIB.cc=     $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared
-U_IS_BIG_ENDIAN = 0
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-oldincludedir = /usr/include
-program_transform_name = s,x,x,
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-INSTALL-L = ${INSTALL_DATA}
-
-# for derivative builds - don't bother with VERBOSE/NONVERBOSE SILENT_COMPILE
-SILENT_COMPILE=$(1)  #M#
-ICU_MSG=@echo "   $(1)	"  #M#
-
-##################################################################
-##################################################################
-#
-#       *5* packaging options and directories
-#
-##################################################################
-
-
-# The basename of the ICU data file (i.e. icudt21b )
-ICUDATA_CHAR = l
-ICUDATA_NAME = icudt65l
-
-# Defaults for pkgdata's mode and directories
-# The default data dir changes depending on what packaging mode 
-# is being used
-ifeq ($(strip $(PKGDATA_MODE)),)
-#SH# if [ "x$PKGDATA_MODE" = "x" ];
-#SH# then
-PKGDATA_MODE=static
-#SH# fi
-endif
-
-#SH# case "$PKGDATA_MODE" in
-ifeq ($(PKGDATA_MODE),common)
-#SH# common)
-ICUDATA_DIR = $(pkgdatadir)
-ICUPKGDATA_DIR = $(ICUDATA_DIR)
-#SH# ;;
-else
-ifeq ($(PKGDATA_MODE),dll)
-#SH# dll)
-ICUDATA_DIR = $(pkgdatadir)
-ICUPKGDATA_DIR = $(libdir)
-#SH# ;;
-else
-#SH# *)
-ICUDATA_DIR = $(pkgdatadir)
-ICUPKGDATA_DIR = $(ICUDATA_DIR)
-#SH# ;;
-endif
-endif
-
-#SH# esac
-
-GENCCODE_ASSEMBLY = -a gcc
-
-##################################################################
-##################################################################
-#
-#       *6* Inclusion of platform make fragment (mh-* file)
-#
-##################################################################
-# The mh- file ("make fragment") for the platform is included here. 
-# It may override the above settings.
-# It is put last so that the mh-file can override anything.
-# The selfcheck is just a sanity check that this makefile is
-# parseable. The mh fragment is only included if this does not occur.
-
-ifeq (selfcheck,$(MAKECMDGOALS)) #M#
-selfcheck: #M#
-	@echo passed #M#
-else #M#
-include $(pkgdatadir)/config/mh-linux
-endif #M#
-

native/icu/work-native/install/usr/local/lib/icu/current/pkgdata.inc

@@ -1,17 +0,0 @@
-GENCCODE_ASSEMBLY_TYPE=-a gcc
-SO=so
-SOBJ=so
-A=a
-LIBPREFIX=lib
-LIB_EXT_ORDER=.65.1
-COMPILE=gcc -O3 -fno-short-wchar -DU_USING_ICU_NAMESPACE=1 -fno-short-enums -DU_HAVE_NL_LANGINFO_CODESET=0 -D__STDC_INT64__ -DU_TIMEZONE=0 -DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=0 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -ffunction-sections -fdata-sections -D_REENTRANT  -DU_HAVE_ELF_H=1 -DU_ENABLE_DYLOAD=0 -DU_HAVE_STRTOD_L=1 -DU_HAVE_XLOCALE_H=0  -DU_ATTRIBUTE_DEPRECATED= -O2   -c
-LIBFLAGS=-I/usr/local/include -DPIC -fPIC
-GENLIB=gcc -O2   -Wl,--gc-sections  -shared -Wl,-Bsymbolic
-LDICUDTFLAGS=-nodefaultlibs -nostdlib
-LD_SONAME=-Wl,-soname -Wl,
-RPATH_FLAGS=
-BIR_LDFLAGS=-Wl,-Bsymbolic
-AR=ar
-ARFLAGS=r
-RANLIB=ranlib
-INSTALL_CMD=/usr/bin/install -c

native/icu/work-native/install/usr/local/lib/icu/pkgdata.inc

@@ -1,17 +0,0 @@
-GENCCODE_ASSEMBLY_TYPE=-a gcc
-SO=so
-SOBJ=so
-A=a
-LIBPREFIX=lib
-LIB_EXT_ORDER=.65.1
-COMPILE=gcc -O3 -fno-short-wchar -DU_USING_ICU_NAMESPACE=1 -fno-short-enums -DU_HAVE_NL_LANGINFO_CODESET=0 -D__STDC_INT64__ -DU_TIMEZONE=0 -DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=0 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -ffunction-sections -fdata-sections -D_REENTRANT  -DU_HAVE_ELF_H=1 -DU_ENABLE_DYLOAD=0 -DU_HAVE_STRTOD_L=1 -DU_HAVE_XLOCALE_H=0  -DU_ATTRIBUTE_DEPRECATED= -O2   -c
-LIBFLAGS=-I/usr/local/include -DPIC -fPIC
-GENLIB=gcc -O2   -Wl,--gc-sections  -shared -Wl,-Bsymbolic
-LDICUDTFLAGS=-nodefaultlibs -nostdlib
-LD_SONAME=-Wl,-soname -Wl,
-RPATH_FLAGS=
-BIR_LDFLAGS=-Wl,-Bsymbolic
-AR=ar
-ARFLAGS=r
-RANLIB=ranlib
-INSTALL_CMD=/usr/bin/install -c

src/cross/open-vm-tools/Makefile

@@ -16,11 +16,11 @@ PRE_CONFIGURE_TARGET = vmtools_pre_configure
 INSTALL_TARGET = vmtools_install
 POST_INSTALL_TARGET = vmtools_post_install
 
-ENV = PATH=$(STAGING_INSTALL_PREFIX)/bin:$$PATH
+ENV += PATH=$(STAGING_INSTALL_PREFIX)/bin:$$PATH
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = 
-CONFIGURE_ARGS += --with-fuse=fuse3
+CONFIGURE_ARGS += --with-fuse=auto
 CONFIGURE_ARGS += --without-x
 CONFIGURE_ARGS += --without-pam
 CONFIGURE_ARGS += --without-xmlsec1
@@ -31,6 +31,7 @@ include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: vmtools_pre_configure
 vmtools_pre_configure:
+	$(RUN) echo -e 'libMisc_la_LDFLAGS =\nlibMisc_la_LDFLAGS += -liconv\n' >> lib/misc/Makefile.am
 	$(RUN) autoreconf -fiv
 
 .PHONY: vmtools_install
@@ -40,8 +41,6 @@ vmtools_install:
 .PHONY: vmtools_post_install
 vmtools_post_install:
 	# chmod a-x $(STAGING_INSTALL_PREFIX)/etc/pam.d/*
-	# chmod a-x $(STAGING_INSTALL_PREFIX)/etc/vmware-tools/*.conf
-	chmod a-x $(STAGING_INSTALL_PREFIX)/etc/vmware-tools/*.conf.example
-	# chmod a-x $(STAGING_INSTALL_PREFIX)/etc/vmware-tools/vgauth/schemas/*
-	# chmod a-x $(STAGING_INSTALL_PREFIX)/lib/udev/rules.d/99-vmware-scsi-udev.rules
-	mv $(STAGING_INSTALL_PREFIX)/usr/bin/vm-support $(STAGING_INSTALL_PREFIX)/bin/
+	# chmod a-x $(STAGING_INSTALL_PREFIX)/etc/vmware-tools/*.conf.example
+	# chmod a-x $(STAGING_INSTALL_PREFIX)/usr/lib/udev/rules.d/99-vmware-scsi-udev.rules
+	# mv $(STAGING_INSTALL_PREFIX)/usr/bin/vm-support $(STAGING_INSTALL_PREFIX)/bin/