components/library/jxrlib/patches/01-Makefile.patch

   1 --- jxrlib/Makefile     Mon May 11 17:07:07 2020
   2 +++ jxrlib/Makefile_patch       Sat Feb 26 10:10:14 2022
   3 @@ -60,7 +60,7 @@
   4  endif
   5
   6  ifndef JAVA_HOME
   7 -JAVA_HOME:=$(shell jrunscript -e 'java.lang.System.out.println(new java.io.File(java.lang.System.getProperty("java.home")).getParent());')
   8 +JAVA_HOME=/usr/jdk/instances/openjdk1.8.0
   9  endif
  10
  11  ifndef JAVA_INCLUDE
  12 @@ -81,8 +81,8 @@
  13
  14  CD=cd
  15  MK_DIR=mkdir -p
  16 -CFLAGS=-I. -Icommon/include -I$(DIR_SYS) $(ENDIANFLAG) -D__ANSI__ -DDISABLE_PERF_MEASUREMENT -w -Os -fPIC
  17 -CXXFLAGS=-I. -Icommon/include -I$(DIR_SYS) -I$(DIR_GLUE) -I$(DIR_TEST) -Wno-self-assign-field -Wno-unsequenced -Os -fPIC
  18 +CFLAGS=-I. -I$(JAVA_INCLUDE)/solaris -Icommon/include -I$(DIR_SYS) $(ENDIANFLAG) -D__ANSI__ -DDISABLE_PERF_MEASUREMENT -w -Os -fPIC
  19 +CXXFLAGS=-I. -I$(JAVA_INCLUDE)/solaris -Icommon/include -I$(DIR_SYS) -I$(DIR_GLUE) -I$(DIR_TEST) -Wno-self-assign-field -Wno-unsequenced -Os -fPIC
  20
  21  ifdef DEBUG
  22  CFLAGS:=$(CFLAGS) -g -O0 -DDEBUG
  23 @@ -305,20 +305,20 @@
  24         rm -rf $(DIR_BUILD)/*App $(DIR_BUILD)/**/*.o $(DIR_BUILD)/**/*.class $(DIR_BUILD)/libj*.a $(DIR_BUILD)/libj*.$(LIBSUFFIX) $(DIR_BUILD)/libjxr.pc $(DIR_BUILD)/$(CXXDECAPP) $(DIR_BUILD)/$(JAR)
  25
  26  $(DIR_BUILD)/libjxr.pc: $(DIR_SRC)/libjxr.pc.in
  27 -       @python -c 'import os; d = { "DIR_INSTALL": "$(DIR_INSTALL)", "JXR_VERSION": "$(JXR_VERSION)", "JXR_ENDIAN": "$(ENDIANFLAG)" }; fin = open("$<", "r"); fout = open("$@", "w+"); fout.writelines( [ l % d for l in fin.readlines()])'
  28 +       @python -c 'import os; d = { "PREFIX": "$(PREFIX)", "JXR_VERSION": "$(JXR_VERSION)", "JXR_ENDIAN": "$(ENDIANFLAG)" }; fin = open("$<", "r"); fout = open("$@", "w+"); fout.writelines( [ l % d for l in fin.readlines()])'
  29
  30  install: all $(DIR_BUILD)/libjxr.pc
  31 -       install -d $(DIR_INSTALL)/lib/pkgconfig $(DIR_INSTALL)/bin $(DIR_INSTALL)/include/libjxr/common  $(DIR_INSTALL)/include/libjxr/image/x86 $(DIR_INSTALL)/include/libjxr/glue $(DIR_INSTALL)/include/libjxr/test $(DIR_INSTALL)/share/doc/jxr-$(JXR_VERSION)
  32 -       install $(LIBRARIES) $(DIR_INSTALL)/lib
  33 -       install -m 644 $(DIR_BUILD)/libjxr.pc $(DIR_INSTALL)/lib/pkgconfig
  34 -       install $(DIR_BUILD)/$(ENCAPP) $(DIR_BUILD)/$(DECAPP) $(DIR_INSTALL)/bin
  35 -       install -m 644 $(DIR_SRC)/common/include/*.h $(DIR_INSTALL)/include/libjxr/common
  36 -       install -m 644 $(DIR_SRC)/image/x86/*.h $(DIR_INSTALL)/include/libjxr/image/x86
  37 -       install -m 644 $(DIR_SRC)/$(DIR_SYS)/*.h $(DIR_INSTALL)/include/libjxr/image
  38 -       install -m 644 $(DIR_SRC)/$(DIR_ENC)/*.h $(DIR_INSTALL)/include/libjxr/image
  39 -       install -m 644 $(DIR_SRC)/$(DIR_DEC)/*.h $(DIR_INSTALL)/include/libjxr/image
  40 -       install -m 644 $(DIR_SRC)/$(DIR_GLUE)/*.h $(DIR_INSTALL)/include/libjxr/glue
  41 -       install -m 644 $(DIR_SRC)/$(DIR_TEST)/*.h $(DIR_INSTALL)/include/libjxr/test
  42 -       install -m 644 doc/* $(DIR_INSTALL)/share/doc/jxr-$(JXR_VERSION)
  43 +       install -d $(DIR_INSTALL)/usr/lib/amd64/pkgconfig $(DIR_INSTALL)/usr/bin $(DIR_INSTALL)/usr/include/libjxr/common  $(DIR_INSTALL)/usr/include/libjxr/image/x86 $(DIR_INSTALL)/usr/include/libjxr/glue $(DIR_INSTALL)/usr/include/libjxr/test $(DIR_INSTALL)/usr/share/doc/jxr-$(JXR_VERSION)
  44 +       install $(LIBRARIES) $(DIR_INSTALL)/usr/lib/amd64/
  45 +       install -m 644 $(DIR_BUILD)/libjxr.pc $(DIR_INSTALL)/usr/lib/amd64/pkgconfig
  46 +       install $(DIR_BUILD)/$(ENCAPP) $(DIR_BUILD)/$(DECAPP) $(DIR_INSTALL)/usr/bin
  47 +       install -m 644 $(DIR_SRC)/common/include/*.h $(DIR_INSTALL)/usr/include/libjxr/common
  48 +       install -m 644 $(DIR_SRC)/image/x86/*.h $(DIR_INSTALL)/usr/include/libjxr/image/x86
  49 +       install -m 644 $(DIR_SRC)/$(DIR_SYS)/*.h $(DIR_INSTALL)/usr/include/libjxr/image
  50 +       install -m 644 $(DIR_SRC)/$(DIR_ENC)/*.h $(DIR_INSTALL)/usr/include/libjxr/image
  51 +       install -m 644 $(DIR_SRC)/$(DIR_DEC)/*.h $(DIR_INSTALL)/usr/include/libjxr/image
  52 +       install -m 644 $(DIR_SRC)/$(DIR_GLUE)/*.h $(DIR_INSTALL)/usr/include/libjxr/glue
  53 +       install -m 644 $(DIR_SRC)/$(DIR_TEST)/*.h $(DIR_INSTALL)/usr/include/libjxr/test
  54 +       install -m 644 doc/* $(DIR_INSTALL)/usr/share/doc/jxr-$(JXR_VERSION)
  55
  56  ##