API tools faq
paste
Advertisement
ponce

gcc5 patch

ponce
Jul 10th, 2017
275
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 16.21 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur gcc5.orig/README gcc5/README
  2. --- gcc5.orig/README 2017-07-10 08:33:36.144000559 +0200
  3. +++ gcc5/README 2017-07-10 09:57:00.806634434 +0200
  4. @@ -39,3 +39,7 @@
  5. Nothing else needs to be done after sourcing the profile script.
  6. All you do next is run your compile job as usual in that same console.
  7. Your program will be compiled with the binaries provided by the gcc5 package.
  8. +
  9. +*WARNING*
  10. +The temporary build location used by the script (defaulting here to /tmp/SBo)
  11. +should *NOT* be a directory path a non-root user could create later...
  12. diff -Naur gcc5.orig/gcc5.SlackBuild gcc5/gcc5.SlackBuild
  13. --- gcc5.orig/gcc5.SlackBuild 2017-07-10 08:35:19.466993001 +0200
  14. +++ gcc5/gcc5.SlackBuild 2017-07-10 11:48:53.945143323 +0200
  15. @@ -59,11 +59,6 @@
  16. BUILD=${BUILD:-1}
  17. TAG=${TAG:-SBo}
  18.  
  19. -# What do we want to build
  20. -LANGS=${LANGS:-'c,c++,java'}
  21. -
  22. -echo "Building these compilers: $LANGS"; sleep 5
  23. -
  24. # Automatically determine the architecture we're building on:
  25. if [ -z "$ARCH" ]; then
  26. case "$(uname -m)" in
  27. @@ -75,6 +70,11 @@
  28. export ARCH
  29. fi
  30.  
  31. +CWD=$(pwd)
  32. +TMP=${TMP:-/tmp/SBo}
  33. +PKG=$TMP/package-$PRGNAM
  34. +OUTPUT=${OUTPUT:-/tmp}
  35. +
  36. if [ "$ARCH" = "i386" ]; then
  37. SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
  38. SLKLDFLAGS=""
  39. @@ -117,6 +117,11 @@
  40. LIB_ARCH=$ARCH
  41. fi
  42.  
  43. +# What do we want to build
  44. +LANGS=${LANGS:-'c,c++,java'}
  45. +
  46. +echo "Building these compilers: $LANGS"
  47. +
  48. case "$ARCH" in
  49. arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
  50. *) TARGET=$ARCH-slackware-linux ;;
  51. @@ -136,32 +141,20 @@
  52. MULTILIB="NO"
  53. fi
  54.  
  55. -CWD=$(pwd)
  56. -# Temporary build location. This should *NOT* be a directory
  57. -# path a non-root user could create later...
  58. -TMP=${TMP:-"/tmp/SBo/gcc-$(mcookie)"}
  59. -
  60. -# Where we dump the package:
  61. -OUTPUT=${OUTPUT:-/tmp}
  62. -
  63. -# This is the main DESTDIR target:
  64. -PKG1=$TMP/package-gcc
  65. -
  66. # Clear the build locations:
  67. -if [ -d $TMP ]; then
  68. - rm -rf $TMP
  69. -fi
  70. -mkdir -p $PKG1/usr/doc/gcc-$VERSION
  71. +rm -fr $TMP/fastjar-* $TMP/gcc-$VERSION $TMP/gcc.build.lnx $TMP/gcc.build.log $TMP/package-$PRGNAM
  72. +
  73. +mkdir -p $PKG/usr/doc/gcc-$VERSION
  74.  
  75. # Insert package description:
  76. -mkdir -p $PKG1/install
  77. +mkdir -p $PKG/install
  78. if [ ${MULTILIB} = "YES" ]; then
  79. SLDESC=" The compilers support multilib."
  80. else
  81. SLDESC=""
  82. fi
  83. cat $CWD/slack-desc.gcc5 | sed -e "s/@MULTILIB@/${SLDESC}/" \
  84. - > $PKG1/install/slack-desc
  85. + > $PKG/install/slack-desc
  86.  
  87. # Unpack the gcc sources:
  88. cd $TMP
  89. @@ -190,95 +183,95 @@
  90. find . -perm 775 -exec chmod 755 {} \;
  91. find . -perm 754 -exec chmod 755 {} \;
  92. find . -perm 664 -exec chmod 644 {} \;
  93. - mkdir -p $PKG1/usr/doc/gcc-$VERSION
  94. + mkdir -p $PKG/usr/doc/gcc-$VERSION
  95. cp -a \
  96. COPYING* ChangeLog* FAQ INSTALL \
  97. LAST_UPDATED MAINTAINERS NEWS \
  98. README* *.html \
  99. - $PKG1/usr/doc/gcc-$VERSION
  100. + $PKG/usr/doc/gcc-$VERSION
  101.  
  102. # We will keep part of these, but they are really big...
  103. if [ -r ChangeLog ]; then
  104. - DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION)
  105. + DOCSDIR=$(echo $PKG/usr/doc/gcc-$VERSION)
  106. cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
  107. touch -r ChangeLog $DOCSDIR/ChangeLog
  108. fi
  109. if [ -r NEWS ]; then
  110. - DOCSDIR=$(echo $PKG1/usr/doc/gcc-$VERSION)
  111. + DOCSDIR=$(echo $PKG/usr/doc/gcc-$VERSION)
  112. cat NEWS | head -n 1000 > $DOCSDIR/NEWS
  113. touch -r NEWS $DOCSDIR/NEWS
  114. fi
  115.  
  116. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/gcc
  117. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/gcc
  118. ( cd gcc
  119. cp -a \
  120. ABOUT* COPYING* DATESTAMP DEV-PHASE LANG* ONEWS README* SERVICE \
  121. - $PKG1/usr/doc/gcc-$VERSION/gcc
  122. + $PKG/usr/doc/gcc-$VERSION/gcc
  123.  
  124. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/gcc/java
  125. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/gcc/java
  126. ( cd java
  127. cp -a \
  128. ChangeLog.tree-ssa \
  129. - $PKG1/usr/doc/gcc-${VERSION}/gcc/java
  130. + $PKG/usr/doc/gcc-${VERSION}/gcc/java
  131. if [ -r ChangeLog ]; then
  132. - cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
  133. - touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
  134. + cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
  135. + touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/gcc/java/ChangeLog
  136. fi
  137. )
  138.  
  139. ) || exit 1
  140.  
  141. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libffi
  142. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/libffi
  143. ( cd libffi
  144. cp -a \
  145. ChangeLog.libgcj ChangeLog.v1 \
  146. LICENSE* README* \
  147. - $PKG1/usr/doc/gcc-${VERSION}/libffi
  148. + $PKG/usr/doc/gcc-${VERSION}/libffi
  149. if [ -r ChangeLog ]; then
  150. - cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libffi/ChangeLog
  151. - touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libffi/ChangeLog
  152. + cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libffi/ChangeLog
  153. + touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libffi/ChangeLog
  154. fi
  155. )
  156.  
  157. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libjava
  158. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/libjava
  159. ( cd libjava
  160. cp -a \
  161. COPYING* HACKING LIBGCJ_LICENSE \
  162. NEWS README* THANKS \
  163. - $PKG1/usr/doc/gcc-${VERSION}/libjava
  164. + $PKG/usr/doc/gcc-${VERSION}/libjava
  165. if [ -r ChangeLog ]; then
  166. - cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libjava/ChangeLog
  167. - touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libjava/ChangeLog
  168. + cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libjava/ChangeLog
  169. + touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libjava/ChangeLog
  170. fi
  171. )
  172.  
  173. if [ -d libmudflap ]; then
  174. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libmudflap
  175. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/libmudflap
  176. ( cd libmudflap
  177. if [ -r ChangeLog ]; then
  178. - cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
  179. - touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
  180. + cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
  181. + touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libmudflap/ChangeLog
  182. fi
  183. )
  184. fi
  185.  
  186. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libgomp
  187. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/libgomp
  188. ( cd libgomp
  189. if [ -r ChangeLog ]; then
  190. - cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
  191. - touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
  192. + cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
  193. + touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libgomp/ChangeLog
  194. fi
  195. )
  196.  
  197. - mkdir -p $PKG1/usr/doc/gcc-${VERSION}/libstdc++-v3
  198. + mkdir -p $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3
  199. ( cd libstdc++-v3
  200. cp -a \
  201. README* \
  202. doc/html/faq.html \
  203. - $PKG1/usr/doc/gcc-${VERSION}/libstdc++-v3
  204. + $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3
  205. if [ -r ChangeLog ]; then
  206. - cat ChangeLog | head -n 1000 > $PKG1/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
  207. - touch -r ChangeLog $PKG1/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
  208. + cat ChangeLog | head -n 1000 > $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
  209. + touch -r ChangeLog $PKG/usr/doc/gcc-${VERSION}/libstdc++-v3/ChangeLog
  210. fi
  211. )
  212. )
  213. @@ -311,23 +304,23 @@
  214. --infodir=/usr/info \
  215. --build=$TARGET
  216. make || exit 1
  217. - make install DESTDIR=$PKG1 || exit 1
  218. - mkdir -p $PKG1/usr/doc/fastjar-$FASTJARVER
  219. + make install DESTDIR=$PKG || exit 1
  220. + mkdir -p $PKG/usr/doc/fastjar-$FASTJARVER
  221. cp -a \
  222. AUTHORS CHANGES COPYING* INSTALL NEWS README* TODO \
  223. - $PKG1/usr/doc/fastjar-$FASTJARVER
  224. + $PKG/usr/doc/fastjar-$FASTJARVER
  225. # If there's a ChangeLog, installing at least part of the recent history
  226. # is useful, but don't let it get totally out of control:
  227. if [ -r ChangeLog ]; then
  228. - DOCSDIR=$(echo $PKG1/usr/doc/fastjar-$FASTJARVER)
  229. + DOCSDIR=$(echo $PKG/usr/doc/fastjar-$FASTJARVER)
  230. cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
  231. touch -r ChangeLog $DOCSDIR/ChangeLog
  232. fi
  233. - find $PKG1 | xargs file | grep -e "executable" -e "shared object" | grep ELF \
  234. + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
  235. | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  236. # Compress and if needed symlink the man pages:
  237. - if [ -d $PKG1/usr/man ]; then
  238. - ( cd $PKG1/usr/man
  239. + if [ -d $PKG/usr/man ]; then
  240. + ( cd $PKG/usr/man
  241. for manpagedir in $(find . -type d -name "man*") ; do
  242. ( cd $manpagedir
  243. for eachpage in $( find . -type l -maxdepth 1) ; do
  244. @@ -340,8 +333,8 @@
  245. )
  246. fi
  247. # Compress info files, if any:
  248. - if [ -d $PKG1/usr/info ]; then
  249. - ( cd $PKG1/usr/info
  250. + if [ -d $PKG/usr/info ]; then
  251. + ( cd $PKG/usr/info
  252. rm -f dir
  253. gzip -9 *
  254. )
  255. @@ -408,17 +401,17 @@
  256. # Include all debugging info (for now):
  257. make bootstrap
  258. make info
  259. - make install DESTDIR=$PKG1
  260. + make install DESTDIR=$PKG
  261.  
  262. # KLUDGE ALERT
  263. # These *gdb.py files are causing ldconfig to complain, so they are going
  264. # to be REMOVED for now... at some point, they might be moved somewhere
  265. # else, in which case things should Just Work(tm). Keep an eye on it.
  266. -rm -f $PKG1/usr/lib*/*gdb.py
  267. +rm -f $PKG/usr/lib*/*gdb.py
  268.  
  269. # Be sure the "specs" file is installed.
  270. -if [ ! -r $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs ]; then
  271. - cat stage1-gcc/specs > $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
  272. +if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs ]; then
  273. + cat stage1-gcc/specs > $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
  274. fi
  275.  
  276. if [ ${MULTILIB} = "NO" ]; then
  277. @@ -426,39 +419,39 @@
  278. (only needed if gcc was compiled with disable-multilib)
  279. if [ "$ARCH" = "x86_64" ]; then
  280. sed -i 's#;.\(:../lib !m64 m32;\)$#;32\1#' \
  281. - $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
  282. + $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/specs
  283. fi
  284. fi
  285.  
  286. -make -i install-info DESTDIR=$PKG1
  287. +make -i install-info DESTDIR=$PKG
  288.  
  289. # Move potentially conflicting stuff to version specific subdirectory:
  290. -if [ -d $PKG1/usr/lib${LIBDIRSUFFIX} ]; then
  291. - mv $PKG1/usr/lib${LIBDIRSUFFIX}/lib* $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/
  292. +if [ -d $PKG/usr/lib${LIBDIRSUFFIX} ]; then
  293. + mv $PKG/usr/lib${LIBDIRSUFFIX}/lib* $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/
  294. fi
  295. -if [ -d $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/lib${LIBDIRSUFFIX}/ ]; then
  296. - mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/lib${LIBDIRSUFFIX}/lib* $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/
  297. +if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/lib${LIBDIRSUFFIX}/ ]; then
  298. + mv $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/lib${LIBDIRSUFFIX}/lib* $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/
  299. fi
  300. -chmod 755 $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/libgcc_s.so.1
  301. +chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/libgcc_s.so.1
  302. if [ ${MULTILIB} = "YES" ]; then
  303. - if [ -d $PKG1/usr/lib ]; then
  304. - mv $PKG1/usr/lib/lib* $PKG1/usr/lib/gcc/${TARGET}/${VERSION}/
  305. + if [ -d $PKG/usr/lib ]; then
  306. + mv $PKG/usr/lib/lib* $PKG/usr/lib/gcc/${TARGET}/${VERSION}/
  307. fi
  308. - if [ -d $PKG1/usr/lib/gcc/${TARGET}/lib/ ]; then
  309. - mv $PKG1/usr/lib/gcc/${TARGET}/lib/lib* $PKG1/usr/lib/gcc/${TARGET}/${VERSION}/
  310. + if [ -d $PKG/usr/lib/gcc/${TARGET}/lib/ ]; then
  311. + mv $PKG/usr/lib/gcc/${TARGET}/lib/lib* $PKG/usr/lib/gcc/${TARGET}/${VERSION}/
  312. fi
  313. - chmod 755 $PKG1/usr/lib/gcc/${TARGET}/${VERSION}/libgcc_s.so.1
  314. + chmod 755 $PKG/usr/lib/gcc/${TARGET}/${VERSION}/libgcc_s.so.1
  315. fi
  316.  
  317. # The (huge) static GNU java libraries are not packaged. In nearly all
  318. # cases one or more dependencies will not be available as static anyway.
  319. -rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj.a
  320. -rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
  321. -rm -f $PKG1/usr/lib/libgcj.a
  322. -rm -f $PKG1/usr/lib/libgcj-tools.a
  323. +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libgcj.a
  324. +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libgcj-tools.a
  325. +rm -f $PKG/usr/lib/libgcj.a
  326. +rm -f $PKG/usr/lib/libgcj-tools.a
  327.  
  328. # Fix stuff up:
  329. -( cd $PKG1/usr/info
  330. +( cd $PKG/usr/info
  331. rm dir
  332. for eachinfo in *.info ; do
  333. mv $eachinfo $(basename $eachinfo .info)-${MAJVER}.info
  334. @@ -466,7 +459,7 @@
  335. gzip -9 *
  336. )
  337.  
  338. -( cd $PKG1/usr/bin
  339. +( cd $PKG/usr/bin
  340. ln -sf g++-${MAJVER} c++-${MAJVER}
  341. ln -sf gcc-${MAJVER} cc-${MAJVER}
  342. # Improved versions of the Slackware c?9 scripts:
  343. @@ -475,7 +468,7 @@
  344. chmod 755 c89 c99
  345. )
  346.  
  347. -( cd $PKG1/usr/man
  348. +( cd $PKG/usr/man
  349. rm -r man7 # Part of the system gcc package
  350. gzip -9 */*
  351. cd man1
  352. @@ -488,25 +481,25 @@
  353.  
  354. # Add profile scripts (non-executable by default) to make it easier
  355. # to set the environment for compiling with gcc5:
  356. -mkdir -p $PKG1/etc/profile.d
  357. -cat $CWD/profile.d/gcc5.sh > $PKG1/etc/profile.d/gcc5.sh
  358. -cat $CWD/profile.d/gcc5.csh > $PKG1/etc/profile.d/gcc5.csh
  359. -chmod 644 $PKG1/etc/profile.d/*
  360. +mkdir -p $PKG/etc/profile.d
  361. +cat $CWD/profile.d/gcc5.sh > $PKG/etc/profile.d/gcc5.sh
  362. +cat $CWD/profile.d/gcc5.csh > $PKG/etc/profile.d/gcc5.csh
  363. +chmod 644 $PKG/etc/profile.d/*
  364.  
  365. # The ecj wrapper script:
  366. -cat $CWD/ecj.sh | sed -e "s,@JAVADIR@,/usr/share/java," > $PKG1/usr/bin/ecj
  367. -chmod 755 $PKG1/usr/bin/ecj
  368. +cat $CWD/ecj.sh | sed -e "s,@JAVADIR@,/usr/share/java," > $PKG/usr/bin/ecj
  369. +chmod 755 $PKG/usr/bin/ecj
  370. # Some compatibility links.
  371. -for JAVAPROG in gcj gcjh gcj-dbtool ; do
  372. - ln -s ${JAVAPROG}-${MAJVER} $PKG1/usr/bin/${JAVAPROG}
  373. +for JAVAPROG in gcj gcjh gcj-dbtool gjar gjarsigner gjavah ; do
  374. + ln -s ${JAVAPROG}-${MAJVER} $PKG/usr/bin/${JAVAPROG}
  375. done
  376. -( cd $PKG1
  377. +( cd $PKG
  378. for JAVALIB in usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/libgcj* ; do
  379. - ln -s /${JAVALIB} $PKG1/usr/lib${LIBDIRSUFFIX}/
  380. + ln -s /${JAVALIB} $PKG/usr/lib${LIBDIRSUFFIX}/
  381. done
  382. )
  383. # And add the missing javac symlink:
  384. -ln -s ../../../bin/ecj $PKG1/usr/lib$LIBDIRSUFFIX/jvm/bin/javac
  385. +ln -s ../../../bin/ecj $PKG/usr/lib$LIBDIRSUFFIX/jvm/bin/javac
  386. # Don't package libffi stuff anymore. GCC will link the internal version
  387. # statically, and we'll need a newer one elsewhere.
  388. find . -name "ffi*.h" | xargs rm -f
  389. @@ -514,18 +507,18 @@
  390. rm -f usr/man/man3/ffi*
  391. rm -f usr/info/libffi*
  392. # Install a proper pkgconfig file for libgcj:
  393. -rm $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/pkgconfig/libgcj*pc
  394. -rm $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/32/pkgconfig/libgcj*pc
  395. -mkdir -p $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig
  396. +rm $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/pkgconfig/libgcj*pc
  397. +rm $PKG/usr/lib${LIBDIRSUFFIX}/gcc/${TARGET}/${VERSION}/32/pkgconfig/libgcj*pc
  398. +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
  399. cat $CWD/libgcj-5.pc \
  400. | sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX}," \
  401. | sed -e "s,@TARGET@,${TARGET}," \
  402. | sed -e "s,@VERSION@,${VERSION}," \
  403. - > $PKG1/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgcj-5.pc
  404. + > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libgcj-5.pc
  405.  
  406. # Filter all .la files (thanks much to Mark Post for the sed script):
  407. ( cd $TMP
  408. - for file in $(find . -type f -name "*.la") ; do
  409. + for file in $(find $PKG -type f -name "*.la") ; do
  410. cat $file | sed -e 's%-L/gcc-[[:graph:]]* % %g' > $TMP/tmp-la-file
  411. cat $TMP/tmp-la-file > $file
  412. done
  413. @@ -533,7 +526,7 @@
  414. )
  415.  
  416. ## Strip bloated binaries and libraries:
  417. -( cd $PKG1
  418. +( cd $PKG
  419. find . -name "lib*so*" -exec strip --strip-unneeded "{}" \;
  420. find . -name "lib*a" -exec strip -g "{}" \;
  421. strip --strip-unneeded usr/bin/* 2> /dev/null
  422. @@ -541,15 +534,13 @@
  423. find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  424. )
  425.  
  426. -( cd $PKG1
  427. +# Remove localizations overlapping with Slackware's gcc
  428. +rm -fr $PKG/usr/share/locale
  429. +
  430. +( cd $PKG
  431. if [ ${MULTILIB} = "YES" ]; then
  432. - /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}_multilib-$ARCH-$BUILD$TAG.txz
  433. + /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}_multilib-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
  434. else
  435. - /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}-$ARCH-$BUILD$TAG.txz
  436. + /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
  437. fi
  438. )
  439. -
  440. -echo
  441. -echo "Slackware GCC5 package build complete!"
  442. -echo
  443. -
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!