logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

icedtea-2.6.28_remove_brace_expansion.diff (10408B)

    

  1. diff --git a/Makefile.am b/Makefile.am
  2. index 964cbb3..75f0838 100644
  3. --- a/Makefile.am
  4. +++ b/Makefile.am
  5. @@ -1645,7 +1645,7 @@ clean-generated:
  6.  	rm -f stamps/generated.stamp
  7.  
  8.  stamps/fonts.stamp: stamps/extract.stamp
  9. -	cp $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{,.old}
  10. +	cp $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old
  11.  	cp linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH)
  12.  	mkdir -p stamps
  13.  	touch $@
  14. @@ -1653,7 +1653,7 @@ stamps/fonts.stamp: stamps/extract.stamp
  15.  clean-fonts:
  16.  	rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties
  17.  	if [ -e $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old ] ; then \
  18. -	  mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,} ; \
  19. +	  mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties ; \
  20.  	fi
  21.  	rm -f stamps/fonts.stamp
  22.  
  23. @@ -2544,7 +2544,7 @@ clean-rewriter:
  24.  
  25.  stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
  26.  if WITH_RHINO
  27. -	mkdir -p rhino/rhino.{old,new} && \
  28. +	mkdir -p rhino/rhino.old rhino/rhino.new && \
  29.  	(cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
  30.  	$(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
  31.  	  com.redhat.rewriter.ClassRewriter \
  32. @@ -3147,7 +3147,10 @@ install-exec-local:
  33.  	${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
  34.  	${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
  35.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
  36. -	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
  37. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/.
  38. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/headless
  39. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
  40. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/xawt
  41.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
  42.  	${mkinstalldirs} $(DESTDIR)${prefix}/tapset
  43.  if SPLIT_DEBUGINFO
  44. @@ -3155,7 +3158,10 @@ if SPLIT_DEBUGINFO
  45.  	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
  46.  	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
  47.  	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
  48. -	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
  49. +	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/.
  50. +	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/headless
  51. +	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
  52. +	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/xawt
  53.  endif
  54.  	for files in $(BUILD_SDK_DIR)/bin/*; do \
  55.  	  name=$$(basename $${files}) ; \
  56. @@ -3268,8 +3274,14 @@ install-data-local:
  57.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs
  58.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib
  59.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
  60. -	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security,zi}
  61. -	${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
  62. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/cmm
  63. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
  64. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/images/cursors
  65. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/management
  66. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/security
  67. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/zi
  68. +	${mkinstalldirs} $(DESTDIR)$(mandir)/man1
  69. +	${mkinstalldirs} $(DESTDIR)$(mandir)/ja_JP.UTF-8/man1
  70.  	${mkinstalldirs} $(DESTDIR)${prefix}/demo
  71.  	${mkinstalldirs} $(DESTDIR)${prefix}/sample
  72.  	${mkinstalldirs} $(DESTDIR)$(docdir)
  73. @@ -3278,7 +3290,7 @@ install-data-local:
  74.  	for files in $(BUILD_SDK_DIR)/jre/lib/*.properties; do \
  75.  	  $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
  76.  	done
  77. -	for files in $(BUILD_SDK_DIR)/jre/lib/fontconfig*.{properties.src,bfc}; do \
  78. +	for files in $(BUILD_SDK_DIR)/jre/lib/fontconfig*.properties.src $(BUILD_SDK_DIR)/jre/lib/fontconfig*.bfc; do \
  79.  	  $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
  80.  	done
  81.  	$(INSTALL_DATA) $(BUILD_SDK_DIR)/release $(DESTDIR)${prefix}
  82. diff --git a/Makefile.in b/Makefile.in
  83. index 01d58a4..b733fb0 100644
  84. --- a/Makefile.in
  85. +++ b/Makefile.in
  86. @@ -1984,7 +1984,7 @@ clean-generated:
  87.  	rm -f stamps/generated.stamp
  88.  
  89.  stamps/fonts.stamp: stamps/extract.stamp
  90. -	cp $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{,.old}
  91. +	cp $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old
  92.  	cp linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH)
  93.  	mkdir -p stamps
  94.  	touch $@
  95. @@ -1992,7 +1992,7 @@ stamps/fonts.stamp: stamps/extract.stamp
  96.  clean-fonts:
  97.  	rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties
  98.  	if [ -e $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old ] ; then \
  99. -	  mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,} ; \
  100. +	  mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties ; \
  101.  	fi
  102.  	rm -f stamps/fonts.stamp
  103.  
  104. @@ -2801,7 +2801,7 @@ clean-rewriter:
  105.  	rm -f stamps/rewriter.stamp
  106.  
  107.  stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
  108. -@WITH_RHINO_TRUE@	mkdir -p rhino/rhino.{old,new} && \
  109. +@WITH_RHINO_TRUE@	mkdir -p rhino/rhino.old rhino/rhino.new && \
  110.  @WITH_RHINO_TRUE@	(cd rhino/rhino.old && $(BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
  111.  @WITH_RHINO_TRUE@	$(BOOT_DIR)/bin/java -cp $(REWRITER_BUILD_DIR) \
  112.  @WITH_RHINO_TRUE@	  com.redhat.rewriter.ClassRewriter \
  113. @@ -3320,14 +3320,20 @@ install-exec-local:
  114.  	${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
  115.  	${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
  116.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
  117. -	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
  118. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/.
  119. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/headless
  120. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
  121. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/xawt
  122.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
  123.  	${mkinstalldirs} $(DESTDIR)${prefix}/tapset
  124.  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/$(bindir) $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib
  125.  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
  126.  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
  127.  @SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
  128. -@SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
  129. +@SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/.
  130. +@SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/headless
  131. +@SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
  132. +@SPLIT_DEBUGINFO_TRUE@	${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/xawt
  133.  	for files in $(BUILD_SDK_DIR)/bin/*; do \
  134.  	  name=$$(basename $${files}) ; \
  135.  	  if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files} -a "x$${name}" != "xjava-rmi.cgi" ; then \
  136. @@ -3435,8 +3441,14 @@ install-data-local:
  137.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs
  138.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib
  139.  	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
  140. -	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security,zi}
  141. -	${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
  142. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/cmm
  143. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
  144. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/images/cursors
  145. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/management
  146. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/security
  147. +	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/zi
  148. +	${mkinstalldirs} $(DESTDIR)$(mandir)/man1
  149. +	${mkinstalldirs} $(DESTDIR)$(mandir)/ja_JP.UTF-8/man1
  150.  	${mkinstalldirs} $(DESTDIR)${prefix}/demo
  151.  	${mkinstalldirs} $(DESTDIR)${prefix}/sample
  152.  	${mkinstalldirs} $(DESTDIR)$(docdir)
  153. @@ -3445,7 +3457,7 @@ install-data-local:
  154.  	for files in $(BUILD_SDK_DIR)/jre/lib/*.properties; do \
  155.  	  $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
  156.  	done
  157. -	for files in $(BUILD_SDK_DIR)/jre/lib/fontconfig*.{properties.src,bfc}; do \
  158. +	for files in $(BUILD_SDK_DIR)/jre/lib/fontconfig*.properties.src $(BUILD_SDK_DIR)/jre/lib/fontconfig*.bfc; do \
  159.  	  $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
  160.  	done
  161.  	$(INSTALL_DATA) $(BUILD_SDK_DIR)/release $(DESTDIR)${prefix}
  162. diff --git a/acinclude.m4 b/acinclude.m4
  163. index 62dc853..516e392 100644
  164. --- a/acinclude.m4
  165. +++ b/acinclude.m4
  166. @@ -374,7 +374,10 @@ AC_DEFUN_ONCE([IT_FIND_ECJ_JAR],
  167.    if test -z "${ECJ_JAR}"; then
  168.      for jar in /usr/share/java/eclipse-ecj.jar \
  169.        /usr/share/java/ecj.jar \
  170. -      /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar; do
  171. +      /usr/share/eclipse-ecj-3.2/lib/ecj.jar \
  172. +      /usr/share/eclipse-ecj-3.3/lib/ecj.jar \
  173. +      /usr/share/eclipse-ecj-3.4/lib/ecj.jar \
  174. +      /usr/share/eclipse-ecj-3.5/lib/ecj.jar; do
  175.          if test -e $jar; then
  176.            ECJ_JAR=$jar
  177.  	  break
  178. diff --git a/configure b/configure
  179. index d7931a5..f2a1047 100755
  180. --- a/configure
  181. +++ b/configure
  182. @@ -10371,7 +10371,10 @@ fi
  183.    if test -z "${ECJ_JAR}"; then
  184.      for jar in /usr/share/java/eclipse-ecj.jar \
  185.        /usr/share/java/ecj.jar \
  186. -      /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar; do
  187. +      /usr/share/eclipse-ecj-3.2/lib/ecj.jar \
  188. +      /usr/share/eclipse-ecj-3.3/lib/ecj.jar \
  189. +      /usr/share/eclipse-ecj-3.4/lib/ecj.jar \
  190. +      /usr/share/eclipse-ecj-3.5/lib/ecj.jar ; do
  191.          if test -e $jar; then
  192.            ECJ_JAR=$jar
  193.  	  break