Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 20 years ago
parent
commit
53366a37dd
4 changed files with 90 additions and 2 deletions
  1. +24
    -2
      package/base/gcc/gcc.conf
  2. +22
    -0
      package/base/gcc/gcc32/libstdc++-localedir.patch
  3. +22
    -0
      package/base/gcc/gcc33/libstdc++-localedir.patch
  4. +22
    -0
      package/base/gcc/gcc34/libstdc++-localedir.patch

+ 24
- 2
package/base/gcc/gcc.conf

@ -126,7 +126,7 @@ custmain() {
# moving them to their final directories.
#
makeinstopt=""
for x in bin info man ; do
for x in bin info man data ; do
mkdir -p $builddir/inst_$x
makeinstopt="$makeinstopt ${x}dir=$builddir/inst_$x"
done
@ -296,6 +296,26 @@ custmain() {
fi
true
done
# Rename and install locales
#
if [ -d "$builddir/inst_data/locale" ] ; then
cd $builddir/inst_data/locale
for x in */LC_MESSAGES/*.mo ; do
[ ! -f "$x" ] && continue # e.g. if $x becomes '*' somehow
y="$root/$prefix/share/locale/$x"
y="${y%.mo}-${pkg_gcc_version}.mo"
mkdir -p ${y%/*}
echo "$x -> $y"
mv $x $y
if [ $ROCKCFG_DEFAULT_CC = $xpkg ] ; then
echo "symlink $x -> $y"
ln -svf ${y##*/} $root/$prefix/share/locale/$x
fi
true
done
fi
hook_eval postdoc
# Create various symlinks for cc, c++, cpp and f77.
@ -374,7 +394,9 @@ custmain() {
# the dynamic loader and force rebuilding of the wrapper links
#
if [ $stagelevel -gt 1 ] ; then
( cd $root/$prefix/lib ; ln -vfs ${gcc_lib_dir}/*.so.* . ; )
[ $ROCKCFG_DEFAULT_CC = $xpkg ] && \
( mkdir -p $root/$prefix/lib ; cd $root/$prefix/lib ; \
ln -vfs ${gcc_lib_dir}/*.so.* . ; )
rm -fv $base/build/$ROCKCFG_ID/ROCK/$toolsdir/.lastupdate
fi

+ 22
- 0
package/base/gcc/gcc32/libstdc++-localedir.patch

@ -0,0 +1,22 @@
pass the install location for locales (datadir) to subdirectories
--- gcc-3.2.3/libstdc++-v3/Makefile.in 2003-01-07 18:32:09.000000000 +0100
+++ src.gcc32.1093803646.8646.312227562/gcc-3.2.3/libstdc++-v3/Makefile.in 2004-08-29 21:26:57.000000000 +0200
@@ -137,6 +137,8 @@
MAINT_CHARSET = latin1
SUBDIRS = include libio libmath libsupc++ src po testsuite
+SUBDIR_FLAGS_TO_PASS = \
+ "datadir=$(datadir)"
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
@@ -281,7 +283,7 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $(SUBDIR_FLAGS_TO_PASS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \

+ 22
- 0
package/base/gcc/gcc33/libstdc++-localedir.patch

@ -0,0 +1,22 @@
pass the install location for locales (datadir) to subdirectories
--- gcc-3.3.3/libstdc++-v3/Makefile.in 2003-07-04 21:53:54.000000000 +0200
+++ gcc-3.3.3/libstdc++-v3/Makefile.in-p 2004-11-04 01:34:50.772314280 +0100
@@ -148,6 +148,8 @@
MAINT_CHARSET = latin1
SUBDIRS = include libio libmath libsupc++ src po testsuite
+SUBDIR_FLAGS_TO_PASS = \
+ "datadir=$(datadir)"
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
@@ -294,7 +296,7 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $(SUBDIR_FLAGS_TO_PASS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \

+ 22
- 0
package/base/gcc/gcc34/libstdc++-localedir.patch

@ -0,0 +1,22 @@
pass the install location for locales (datadir) to subdirectories
--- gcc-3.4.2/libstdc++-v3/Makefile.in 2004-03-18 18:35:12.000000000 +0100
+++ gcc-3.4.2/libstdc++-v3/Makefile.in-p 2004-11-04 01:40:40.864092240 +0100
@@ -220,6 +220,8 @@
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
@GLIBCXX_HOSTED_TRUE@hosted_source = src po
SUBDIRS = include libmath libsupc++ $(hosted_source) testsuite
+SUBDIR_FLAGS_TO_PASS = \
+ "datadir=$(datadir)"
# Multilib support.
MAKEOVERRIDES =
@@ -370,7 +372,7 @@
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $(SUBDIR_FLAGS_TO_PASS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \

Loading…
Cancel
Save