diff options
| author | Vlad Glagolev | 2011-09-10 20:58:09 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2011-10-02 21:14:16 +0400 |
| commit | a73ccdcbffa0a26ac7627c4ffc52c8617d2f4849 (patch) | |
| tree | b9b9cbb909d1200a8cc89a84737f3c08096b9508 | |
| parent | 5e862a929d2274f5b3e26dea5a9fe87af5726b6d (diff) | |
gcc: fix gdb module install path
(cherry picked from commit 2fa5e99e9cd5cc53db22098ffdba8dd441e32861)
| -rwxr-xr-x | gnu/gcc/DETAILS | 1 | ||||
| -rw-r--r-- | gnu/gcc/HISTORY | 5 | ||||
| -rwxr-xr-x | gnu/gcc/PRE_BUILD | 3 | ||||
| -rw-r--r-- | gnu/gcc/python-gdb.patch | 22 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS index d3b18076a9..64548b45f1 100755 --- a/gnu/gcc/DETAILS +++ b/gnu/gcc/DETAILS @@ -1,5 +1,6 @@ SPELL=gcc VERSION=4.6.1 + PATCHLEVEL=1 BASE_SOURCE_URL="ftp://gcc.gnu.org/gnu/gcc/${SPELL}-${VERSION}" SOURCE=gcc-core-$VERSION.tar.bz2 SOURCE2=$SOURCE.sig diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index 4e20a2ef24..48aee69202 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,3 +1,8 @@ +2011-09-10 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: PATCHLEVEL=1 + * PRE_BUILD: apply the patch + * python-gdb.patch: added, to fix gdb module install path + 2011-07-31 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net> * CONFIGURE: should be _list not _multi diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index 8e136d6375..55398f4c4b 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -59,4 +59,5 @@ cd $SOURCE_DIRECTORY && sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in && -patch -p1 < $SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch +patch -p0 < "$SPELL_DIRECTORY/python-gdb.patch" && +patch -p1 < "$SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch" diff --git a/gnu/gcc/python-gdb.patch b/gnu/gcc/python-gdb.patch new file mode 100644 index 0000000000..b95d611e1e --- /dev/null +++ b/gnu/gcc/python-gdb.patch @@ -0,0 +1,22 @@ +--- libstdc++-v3/python/Makefile.in.orig 2011-03-08 03:04:05.000000000 +0300 ++++ libstdc++-v3/python/Makefile.in 2011-09-10 18:09:36.692249020 +0400 +@@ -493,7 +493,7 @@ + -e 's,@toolexeclibdir@,$(toolexeclibdir),' < $(srcdir)/hook.in > $@ + + install-data-local: gdb.py +- @$(mkdir_p) $(DESTDIR)$(toolexeclibdir) ++ @$(mkdir_p) $(DESTDIR)$(datadir)/gdb/auto-load + @here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \ + for file in libstdc++*; do \ + case $$file in \ +@@ -506,8 +506,8 @@ + esac; \ + done; \ + cd $$here; \ +- echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \ +- $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py ++ echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$$libname-gdb.py"; \ ++ $(INSTALL_DATA) gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$$libname-gdb.py + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. |