hpklinux-opt.patch

   1 --- hpklinux_4.20.36-g76c09bc/hpi-cli-apps/Makefile.orig        2021-10-19 20:33:01.000000000 +0200
   2 +++ hpklinux_4.20.36-g76c09bc/hpi-cli-apps/Makefile     2022-03-18 21:47:57.802049088 +0100
   3 @@ -33,14 +33,16 @@ AR = $(CROSS_COMPILE)ar
   4  LD = $(CROSS_COMPILE)ld
   5
   6  #WARNFULL_CFLAGS = -Wextra -pedantic -std=gnu99 -Wconversion
   7 -CFLAGS = -pipe -g -O2 -Wall -DHPI_OS_LINUX -DHPI_BUILD_EXCLUDE_ALL_DEPRECATED \
   8 +CFLAGS += -pipe -Wall -DHPI_OS_LINUX -DHPI_BUILD_EXCLUDE_ALL_DEPRECATED \
   9         $(WARNFULL_CFLAGS)
  10
  11  # Find out if this is a 64-bit build
  12 -ar_gcc_arch=$(shell $(CC) -dumpmachine | awk -F- '{ print $$1 }')
  13 -ifeq ($(ar_gcc_arch),x86_64)
  14 +ar_gcc_machine=$(shell $(CC) -dumpmachine)
  15 +ifneq ($(patsubst %gnux32,,$(ar_gcc_machine)),)
  16 +ifeq ($(patsubst x86_64%,,$(ar_gcc_machine)),)
  17         CFLAGS += -D HPI_BUILD_64BIT
  18  endif
  19 +endif
  20
  21  bins = asihpitest asihpiassert asihpitune asihpirec asihpiplay \
  22         asi_firmware_updater asihpibl asihpirds asihpi_si4688
  23 --- hpklinux_4.20.36-g76c09bc/hpi-lib/Makefile.orig     2022-03-18 21:49:00.505042730 +0100
  24 +++ hpklinux_4.20.36-g76c09bc/hpi-lib/Makefile  2022-03-18 21:49:05.541682110 +0100
  25 @@ -37,7 +37,7 @@ LIB_VER_INC = 0
  26  lib-version-suffix = $(LIB_VER_MAJOR).$(LIB_VER_MINOR).$(LIB_VER_INC)
  27
  28  #WARNFULL_CFLAGS = -Wextra -pedantic -std=gnu99 -Wconversion
  29 -CFLAGS += -ggdb -fPIC -pipe -Wall $(WARNFULL_CFLAGS) \
  30 +CFLAGS += -fPIC -pipe -Wall $(WARNFULL_CFLAGS) \
  31         -DHPI_BUILD_DEBUG \
  32         -DHPI_BUILD_INCLUDE_INTERNAL \
  33         -DHPI_BUILD_EXCLUDE_ALL_DEPRECATED \
  34 @@ -51,13 +51,17 @@ dynamic-libs = libhpi.so libhpiudp.so li
  35  libs = $(static-libs) $(dynamic-libs)
  36
  37  # Find out if this is a 64-bit build
  38 -ar_gcc_arch=$(shell $(CC) -dumpmachine | awk -F- '{ print $$1 }')
  39 -ifeq ($(ar_gcc_arch),x86_64)
  40 +ar_gcc_machine=$(shell $(CC) -dumpmachine)
  41 +ifeq ($(patsubst %gnux32,,$(ar_gcc_machine)),)
  42 +       lib-install-dir-candidates = $(install-prefix)/libx32
  43 +else
  44 +ifeq ($(patsubst x86_64%,,$(ar_gcc_machine)),)
  45         CFLAGS += -D HPI_BUILD_64BIT
  46 -       lib-install-dir-candidates = $(install-prefix)/lib64 $(install-prefix)/lib
  47 +       lib-install-dir-candidates = $(install-prefix)/lib64
  48  else
  49         lib-install-dir-candidates = $(install-prefix)/lib
  50  endif
  51 +endif
  52
  53  #### Detect library destination directory
  54  # Use ldconfig to get a list of directories searched for dynamic libraries