PageRenderTime 56ms CodeModel.GetById 23ms RepoModel.GetById 1ms app.codeStats 0ms

/frysk-0.4-nopkglibdir.patch

#
Patch | 233 lines | 212 code | 21 blank | 0 comment | 0 complexity | c8330568b19dda3a3e5b92d7e1c94fe6 MD5 | raw file
Possible License(s): BSD-3-Clause, GPL-2.0 
    

  1. diff -up frysk-0.4/frysk-common/Makefile.gen.sh.nopkglibdir frysk-0.4/frysk-common/Makefile.gen.sh
    2. 

  2. --- frysk-0.4/frysk-common/Makefile.gen.sh.nopkglibdir	2012-02-11 23:00:39.095000078 -0500
    3. 

  3. +++ frysk-0.4/frysk-common/Makefile.gen.sh	2012-02-11 23:00:39.544000078 -0500
    4. 

  4. @@ -225,7 +225,10 @@ echo_PROGRAMS ()
    5. 

  5.  	*dir/* )
    6. 

  6.              # extract the directory prefix
    7. 

  7.              local dir=`echo /"$1" | sed -e 's,.*/\([a-z]*\)dir/.*,\1,'`
    8. 

  8. -            echo "${dir}_PROGRAMS += $1"
    9. 

  9. +	    case $dir in
    10. 

  10. +	      pkglib ) echo "noinst_PROGRAMS += $1" ;;
    11. 

  11. +              * ) echo "${dir}_PROGRAMS += $1" ;;
    12. 

  12. +	    esac
    13. 

  13.  	    ;;
    14. 

  14.          * )
    15. 

  15.  	    echo "noinst_PROGRAMS += $1"
    16. 

  16. @@ -726,8 +729,16 @@ do
    17. 

  17.    do
    18. 

  18.      d=`dirname $file`
    19. 

  19.      b=`basename $file ${suffix}`
    20. 

  20. -    echo `expr $d : '.*/\([a-z]*\)dir'`_SCRIPTS += $d/$b
    21. 

  21. -    check_MANS $d/$b
    22. 

  22. +    dir=`expr $d : '.*/\([a-z]*\)dir'`
    23. 

  23. +    case $dir in
    24. 

  24. +      pkglib )
    25. 

  25. +	echo noinst_SCRIPTS += $d/$b
    26. 

  26. +	;;
    27. 

  27. +      * )
    28. 

  28. +	echo "${dir}_SCRIPTS += $d/$b"
    29. 

  29. +    	check_MANS $d/$b
    30. 

  30. +	;;
    31. 

  31. +    esac
    32. 

  32.      cat <<EOF
    33. 

  33.  ${d}/${b}: ${file}
    34. 

  34.  	\$(SUBST)
    35. 

  35. diff -up frysk-0.4/frysk-common/Makefile.rules.nopkglibdir frysk-0.4/frysk-common/Makefile.rules
    36. 

  36. --- frysk-0.4/frysk-common/Makefile.rules.nopkglibdir	2012-02-11 23:00:39.493000079 -0500
    37. 

  37. +++ frysk-0.4/frysk-common/Makefile.rules	2012-02-11 23:01:33.129016031 -0500
    38. 

  38. @@ -53,7 +53,6 @@ FRYSK_ASCOMPILE = $(CCAS) $(DEFS) $(DEFA
    39. 

  39.  
    40. 

  40.  # Initialize everything to empty and then use += to add things in.
    41. 

  41.  
    42. 

  42. -noinst_SCRIPTS =
    43. 

  43.  SUFFIXES =
    44. 

  44.  BUILT_SOURCES = 
    45. 

  45.  CLEANFILES = $(BUILT_SOURCES)
    46. 

  46. @@ -61,14 +60,11 @@ CLEANDIRS =
    47. 

  47.  MOSTLYCLEANFILES = core.[1-9]*
    48. 

  48.  noinst_PROGRAMS =
    49. 

  49.  noinst_DATA =
    50. 

  50. +noinst_SCRIPTS =
    51. 

  51.  bin_PROGRAMS =
    52. 

  52.  bin_SCRIPTS =
    53. 

  53.  sbin_PROGRAMS =
    54. 

  54.  sbin_SCRIPTS =
    55. 

  55. -pkgdata_PROGRAMS =
    56. 

  56. -pkglib_PROGRAMS =
    57. 

  57. -pkglib_SCRIPTS =
    58. 

  58. -pkglibdir = $(libdir)/@PACKAGE@
    59. 

  59.  pkglib32_PROGRAMS =
    60. 

  60.  pkglib32dir = $(lib32dir)/@PACKAGE@
    61. 

  61.  pkglib64dir = $(lib64dir)/@PACKAGE@
    62. 

  62. diff -up frysk-0.4/frysk-core/Makefile.am.nopkglibdir frysk-0.4/frysk-core/Makefile.am
    63. 

  63. --- frysk-0.4/frysk-core/Makefile.am.nopkglibdir	2012-02-11 23:00:39.226000079 -0500
    64. 

  64. +++ frysk-0.4/frysk-core/Makefile.am	2012-02-11 23:01:40.329995991 -0500
    65. 

  65. @@ -70,7 +70,7 @@ GEN_GCJ_LDADD_LIST += -lstdc++
    66. 

  66.  GEN_GCJ_LDADD_LIST += -laudit
    67. 

  67.  
    68. 

  68.  # For TestExec.java
    69. 

  69. -pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
    70. 

  70. +noinst_PROGRAMS += frysk/pkglibdir/funit-exec-alias
    71. 

  71.  frysk_pkglibdir_funit_exec_alias_SOURCES =
    72. 

  72.  frysk/pkglibdir/funit-exec-alias: frysk/pkglibdir/funit-exec
    73. 

  73.  	cp -p frysk/pkglibdir/funit-exec $@
    74. 

  74. @@ -79,7 +79,7 @@ frysk/pkglibdir/funit-exec-alias: frysk/
    75. 

  75.  frysk_pkglibdir_test1_LDADD = -lm
    76. 

  76.  
    77. 

  77.  if DO_ARCH32_TEST
    78. 

  78. -pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-exec-alias
    79. 

  79. +noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-exec-alias
    80. 

  80.  frysk_pkglibdir_arch32_funit_exec_alias_SOURCES =
    81. 

  81.  frysk/pkglibdir/arch32/funit-exec-alias: frysk/pkglibdir/arch32/funit-exec
    82. 

  82.  	cp -p frysk/pkglibdir/arch32/funit-exec $@
    83. 

  83. @@ -103,8 +103,8 @@ frysk/debuginfo/TestTypeFactory.java: fr
    84. 

  84.  # of the test program (in particular c++ exceptions).
    85. 

  85.  
    86. 

  86.  # funit-stacks
    87. 

  87. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-nodebug
    88. 

  88. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-noeh
    89. 

  89. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-nodebug
    90. 

  90. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-noeh
    91. 

  91.  frysk_pkglibdir_funit_stacks_nodebug_SOURCES =
    92. 

  92.  frysk_pkglibdir_funit_stacks_noeh_SOURCES =
    93. 

  93.  frysk/pkglibdir/funit-stacks-nodebug: frysk/pkglibdir/funit-stacks
    94. 

  94. @@ -115,8 +115,8 @@ frysk/pkglibdir/funit-stacks-noeh: frysk
    95. 

  95.  		frysk/pkglibdir/funit-stacks $@
    96. 

  96.  
    97. 

  97.  # funit-empty-functions
    98. 

  98. -pkglib_PROGRAMS += frysk/pkglibdir/funit-empty-functions-nodebug
    99. 

  99. -pkglib_PROGRAMS += frysk/pkglibdir/funit-empty-functions-noeh
    100. 

  100. +noinst_PROGRAMS += frysk/pkglibdir/funit-empty-functions-nodebug
    101. 

  101. +noinst_PROGRAMS += frysk/pkglibdir/funit-empty-functions-noeh
    102. 

  102.  frysk_pkglibdir_funit_empty_functions_nodebug_SOURCES =
    103. 

  103.  frysk_pkglibdir_funit_empty_functions_noeh_SOURCES =
    104. 

  104.  frysk/pkglibdir/funit-empty-functions-nodebug: frysk/pkglibdir/funit-empty-functions
    105. 

  105. @@ -127,8 +127,8 @@ frysk/pkglibdir/funit-empty-functions-no
    106. 

  106.  		frysk/pkglibdir/funit-empty-functions $@
    107. 

  107.  
    108. 

  108.  # funit-stacks-exit
    109. 

  109. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-nodebug
    110. 

  110. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-noeh
    111. 

  111. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-nodebug
    112. 

  112. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-noeh
    113. 

  113.  frysk_pkglibdir_funit_stacks_exit_nodebug_SOURCES =
    114. 

  114.  frysk_pkglibdir_funit_stacks_exit_noeh_SOURCES =
    115. 

  115.  frysk/pkglibdir/funit-stacks-exit-nodebug: frysk/pkglibdir/funit-stacks-exit
    116. 

  116. @@ -139,8 +139,8 @@ frysk/pkglibdir/funit-stacks-exit-noeh:
    117. 

  117.  		frysk/pkglibdir/funit-stacks-exit $@
    118. 

  118.  
    119. 

  119.  # funit-scopes
    120. 

  120. -pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-nodebug
    121. 

  121. -pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-noeh
    122. 

  122. +noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-nodebug
    123. 

  123. +noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-noeh
    124. 

  124.  frysk_pkglibdir_funit_scopes_nodebug_SOURCES =
    125. 

  125.  frysk_pkglibdir_funit_scopes_noeh_SOURCES =
    126. 

  126.  frysk/pkglibdir/funit-scopes-nodebug: frysk/pkglibdir/funit-scopes
    127. 

  127. @@ -151,8 +151,8 @@ frysk/pkglibdir/funit-scopes-noeh: frysk
    128. 

  128.  		frysk/pkglibdir/funit-scopes $@
    129. 

  129.  
    130. 

  130.  # funit-scopes-workaround
    131. 

  131. -pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-nodebug
    132. 

  132. -pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-noeh
    133. 

  133. +noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-nodebug
    134. 

  134. +noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-noeh
    135. 

  135.  frysk_pkglibdir_funit_scopes_workaround_nodebug_SOURCES =
    136. 

  136.  frysk_pkglibdir_funit_scopes_workaround_noeh_SOURCES =
    137. 

  137.  frysk/pkglibdir/funit-scopes-workaround-nodebug: frysk/pkglibdir/funit-scopes-workaround
    138. 

  138. @@ -163,8 +163,8 @@ frysk/pkglibdir/funit-scopes-workaround-
    139. 

  139.  		frysk/pkglibdir/funit-scopes-workaround $@
    140. 

  140.  
    141. 

  141.  # funit-stack-inlined
    142. 

  142. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-nodebug
    143. 

  143. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-noeh
    144. 

  144. +noinst_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-nodebug
    145. 

  145. +noinst_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-noeh
    146. 

  146.  frysk_pkglibdir_funit_stack_inlined_nodebug_SOURCES =
    147. 

  147.  frysk_pkglibdir_funit_stack_inlined_noeh_SOURCES =
    148. 

  148.  frysk/pkglibdir/funit-stack-inlined-nodebug: frysk/pkglibdir/funit-stack-inlined
    149. 

  149. @@ -175,8 +175,8 @@ frysk/pkglibdir/funit-stack-inlined-noeh
    150. 

  150.  		frysk/pkglibdir/funit-stack-inlined $@
    151. 

  151.  
    152. 

  152.  # funit-stacks-values
    153. 

  153. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-values-nodebug
    154. 

  154. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-values-noeh
    155. 

  155. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-values-nodebug
    156. 

  156. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-values-noeh
    157. 

  157.  frysk_pkglibdir_funit_stacks_values_nodebug_SOURCES =
    158. 

  158.  frysk_pkglibdir_funit_stacks_values_noeh_SOURCES =
    159. 

  159.  frysk/pkglibdir/funit-stacks-values-nodebug: frysk/pkglibdir/funit-stacks-values
    160. 

  160. @@ -187,8 +187,8 @@ frysk/pkglibdir/funit-stacks-values-noeh
    161. 

  161.  		frysk/pkglibdir/funit-stacks-values $@
    162. 

  162.  
    163. 

  163.  # funit-stacks-linenum
    164. 

  164. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-nodebug
    165. 

  165. -pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-noeh
    166. 

  166. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-nodebug
    167. 

  167. +noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-noeh
    168. 

  168.  frysk_pkglibdir_funit_stacks_linenum_nodebug_SOURCES =
    169. 

  169.  frysk_pkglibdir_funit_stacks_linenum_noeh_SOURCES =
    170. 

  170.  frysk/pkglibdir/funit-stacks-linenum-nodebug: frysk/pkglibdir/funit-stacks-linenum
    171. 

  171. @@ -199,8 +199,8 @@ frysk/pkglibdir/funit-stacks-linenum-noe
    172. 

  172.  		frysk/pkglibdir/funit-stacks-linenum $@
    173. 

  173.  
    174. 

  174.  # funit-cpp-scopes-class
    175. 

  175. -pkglib_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-nodebug
    176. 

  176. -pkglib_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-noeh
    177. 

  177. +noinst_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-nodebug
    178. 

  178. +noinst_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-noeh
    179. 

  179.  frysk_pkglibdir_funit_cpp_scopes_class_nodebug_SOURCES =
    180. 

  180.  frysk_pkglibdir_funit_cpp_scopes_class_noeh_SOURCES =
    181. 

  181.  frysk/pkglibdir/funit-cpp-scopes-class-nodebug: frysk/pkglibdir/funit-cpp-scopes-class
    182. 

  182. @@ -213,13 +213,13 @@ frysk/pkglibdir/funit-cpp-scopes-class-n
    183. 

  183.  
    184. 

  184.  # Create executables for symbol tests for TestSymbol.java.
    185. 

  185.  
    186. 

  186. -pkglib_PROGRAMS += frysk/pkglibdir/funit-symbols-nodebug
    187. 

  187. +noinst_PROGRAMS += frysk/pkglibdir/funit-symbols-nodebug
    188. 

  188.  frysk_pkglibdir_funit_symbols_nodebug_SOURCES =
    189. 

  189.  frysk/pkglibdir/funit-symbols-nodebug: frysk/pkglibdir/funit-symbols
    190. 

  190.  	strip --strip-debug -o $@ frysk/pkglibdir/funit-symbols
    191. 

  191.  
    192. 

  192.  
    193. 

  193. -pkglib_PROGRAMS += frysk/pkglibdir/funit-symbols-stripped
    194. 

  194. +noinst_PROGRAMS += frysk/pkglibdir/funit-symbols-stripped
    195. 

  195.  frysk_pkglibdir_funit_symbols_stripped_SOURCES =
    196. 

  196.  frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
    197. 

  197.  	strip -o $@ frysk/pkglibdir/funit-symbols
    198. 

  198. @@ -268,13 +268,13 @@ uninstall-sysroot-local:
    199. 

  199.  	rm -rf $(pkglib32dir)/test-sysroot
    200. 

  200.  
    201. 

  201.  if DO_ARCH32_TEST
    202. 

  202. -pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
    203. 

  203. +noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
    204. 

  204.  frysk_pkglibdir_arch32_funit_symbols_nodebug_SOURCES =
    205. 

  205.  frysk/pkglibdir/arch32/funit-symbols-nodebug: frysk/pkglibdir/arch32/funit-symbols
    206. 

  206.  	strip --strip-debug -o $@ frysk/pkglibdir/arch32/funit-symbols
    207. 

  207.  
    208. 

  208.  
    209. 

  209. -pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-stripped
    210. 

  210. +noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-stripped
    211. 

  211.  frysk_pkglibdir_arch32_funit_symbols_stripped_SOURCES =
    212. 

  212.  frysk/pkglibdir/arch32/funit-symbols-stripped: frysk/pkglibdir/arch32/funit-symbols
    213. 

  213.  	strip -o $@ frysk/pkglibdir/arch32/funit-symbols
    214. 

  214. @@ -318,7 +318,7 @@ frysk/pkgdatadir/test-core-x86:
    215. 

  215.  	ln -s -f @abs_top_builddir@/../frysk-sys/$@ $@
    216. 

  216.  
    217. 

  217.  # The following links two files into one executable
    218. 

  218. -pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
    219. 

  219. +noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
    220. 

  220.  frysk_pkglibdir_funit_scopes_multi_file_SOURCES =
    221. 

  221.  frysk/pkglibdir/funit-scopes-multi-file:
    222. 

  222.  	gcc -g $(srcdir)/frysk/pkglibdir/funit-scopes-multi-file-a.c  $(srcdir)/frysk/pkglibdir/funit-scopes-multi-file-b.c  -o   frysk/pkglibdir/funit-scopes-multi-file
    223. 

  223. diff -up frysk-0.4/frysk-imports/tests/Makefile.am.nopkglibdir frysk-0.4/frysk-imports/tests/Makefile.am
    224. 

  224. --- frysk-0.4/frysk-imports/tests/Makefile.am.nopkglibdir	2008-06-09 14:03:07.000000000 -0400
    225. 

  225. +++ frysk-0.4/frysk-imports/tests/Makefile.am	2012-02-11 23:01:46.275993979 -0500
    226. 

  226. @@ -42,7 +42,6 @@ AM_CFLAGS = -Werror -Wall -I$(top_srcdir
    227. 

  227.  # Gag all the output from the failing tests
    228. 

  228.  noinst_PROGRAMS =
    229. 

  229.  noinst_SCRIPTS =
    230. 

  230. -pkglib_SCRIPTS =
    231. 

  231.  TESTS_ENVIRONMENT = eval > /dev/null 2>&1
    232. 

  232.  XFAIL_TESTS =
    233. 

  233.  PASS_TESTS =
    234. 

  234.