[Crosstoolchain-logs] [crosstoolchain] 03/04: Initial workingish version of structure (rules/control). Builds now run.

Wookey wookey at moszumanska.debian.org
Thu Feb 6 17:24:54 UTC 2014


This is an automated email from the git hooks/post-receive script.

wookey pushed a commit to branch master
in repository crosstoolchain.

commit bdbdb6303bcc1794907d17319198c759e366668b
Author: Wookey <wookey at wookware.org>
Date:   Thu Feb 6 17:23:45 2014 +0000

    Initial workingish version of structure (rules/control). Builds now run.
---
 cross-gcc-0.1/debian/control         | 110 ++++++++---------------------------
 cross-gcc-0.1/debian/control.head.in |  11 ++--
 cross-gcc-0.1/debian/rules           |  18 +++---
 3 files changed, 41 insertions(+), 98 deletions(-)

diff --git a/cross-gcc-0.1/debian/control b/cross-gcc-0.1/debian/control
index 1fbb4f6..d9155c9 100644
--- a/cross-gcc-0.1/debian/control
+++ b/cross-gcc-0.1/debian/control
@@ -3,106 +3,46 @@ Section: devel
 Priority: extra
 Maintainer: Wookey <wookey at wookware.org>
 Standards-Version: 3.9.5
-Build-Depends: dpkg-dev, dpkg,
-  binutils-source, autoconf (>=2.64), dejagnu,
-  bison, flex, gettext, texinfo, quilt, lsb-release,
-  sed, tar, xz-utils, python3:any, zlib1g-dev
+Build-Depends: dpkg-dev, dpkg, debhelper, gcc-4.8-source, 
+ libc6-dev:armel, linux-libc-dev:armel, libgcc1:armel, 
+ bison, flex, gettext, texinfo, libtool, locales, gdb,
+ sharutils, procps, python, libffi-dev, libmagic-dev, zip, 
+ netbase, libcloog-isl-dev (>= 0.18),  libmpc-dev (>= 1.0), libmpfr-dev, libgmp-dev (>= 2:5.0.1~), 
+ dejagnu, autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt,
+ ghostscript, xsltproc, libxml2-utils, docbook-xsl-ns
 Vcs-Browser: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=crosstoolchain/crosstoolchain.git;a=tree
 Vcs-Git: https://alioth.debian.org/anonscm/git/crosstoolchain/crosstoolchain.git
 
-Package: binutils-arm-linux-gnueabihf
+Package: cpp-GCC_BASE_VER-arm-linux-gnueabihf
 Architecture: amd64 i386
 Section: devel
 Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting armhf
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building armhf binaries/packages
+Built-Using: gcc-GCC_BASE_VER-GCC.VER
+Description: Cross-gcc (cpp) targetting armhf
+ This package is the GNU C pre-processor cpp built for cross-building 
+ armhf binaries/packages
  .
- It is built by the cross-binutils package from the normal binutils
- sources.
+ It is built by the cross-gcc package from the normal gcc sources.
 
-Package: binutils-arm-linux-gnueabi
+Package: gcc-GCC_BASE_VER-arm-linux-gnueabihf
 Architecture: amd64 i386
 Section: devel
 Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting armel
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building armel binaries/packages
+Built-Using: gcc-GCC_BASE_VER-GCC.VER
+Description: Cross-gcc (GCC) targetting armhf
+ This package is the GNU C compiler built for cross-building 
+ armhf binaries/packages
  .
- It is built by the cross-binutils package from the normal binutils
- sources.
+ It is built by the cross-gcc package from the normal gcc sources.
 
-Package: binutils-aarch64-linux-gnu
+Package: g++-GCC_BASE_VER-arm-linux-gnueabihf
 Architecture: amd64 i386
 Section: devel
 Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting arm64
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building arm64 binaries/packages
+Built-Using: gcc-GCC_BASE_VER-GCC.VER
+Description: Cross-gcc (G++) targetting armhf
+ This package is the GNU C++ compiler built for cross-building 
+ armhf binaries/packages
  .
- It is built by the cross-binutils package from the normal binutils
- sources.
-
-Package: binutils-mips-linux-gnu
-Architecture: amd64 i386
-Section: devel
-Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting mips
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building mips binaries/packages
- .
- It is built by the cross-binutils package from the normal binutils
- sources.
-
-Package: binutils-mipsel-linux-gnu
-Architecture: amd64 i386
-Section: devel
-Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting mipsel
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building mipsel binaries/packages
- .
- It is built by the cross-binutils package from the normal binutils
- sources.
-
-Package: binutils-powerpc-linux-gnu
-Architecture: amd64 i386
-Section: devel
-Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting powerpc
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building powerpc binaries/packages
- .
- It is built by the cross-binutils package from the normal binutils
- sources.
-
-Package: binutils-i486-linux-gnu
-Architecture: amd64
-Section: devel
-Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting i386
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building i386 binaries/packages
- .
- It is built by the cross-binutils package from the normal binutils
- sources.
-
-Package: binutils-x86_64-linux-gnu
-Architecture: i386
-Section: devel
-Depends: ${misc:Depends}
-Built-Using: binutils-BINUTILS.VER
-Description: Cross-binutils (assembler, linker etc) targetting amd64
- This package is the GNU binutils (assembler, linker, strip etc) built
- for cross-building amd64 binaries/packages
- .
- It is built by the cross-binutils package from the normal binutils
- sources.
+ It is built by the cross-gcc package from the normal gcc sources.
 
diff --git a/cross-gcc-0.1/debian/control.head.in b/cross-gcc-0.1/debian/control.head.in
index a8bab5d..288d761 100644
--- a/cross-gcc-0.1/debian/control.head.in
+++ b/cross-gcc-0.1/debian/control.head.in
@@ -3,10 +3,13 @@ Section: devel
 Priority: extra
 Maintainer: Wookey <wookey at wookware.org>
 Standards-Version: 3.9.5
-Build-Depends: dpkg-dev, dpkg,
-  binutils-source, autoconf (>=2.64), dejagnu,
-  bison, flex, gettext, texinfo, quilt, lsb-release,
-  sed, tar, xz-utils, python3:any, zlib1g-dev
+Build-Depends: dpkg-dev, dpkg, debhelper, gcc-4.8-source, 
+ libc6-dev:armel, linux-libc-dev:armel, libgcc1:armel,
+ bison, flex, gettext, libtool, gdb,
+ sharutils, netbase, libcloog-isl-dev (>= 0.18),  libmpc-dev (>= 1.0), 
+ libmpfr-dev, libgmp-dev (>= 2:5.0.1~), 
+ autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt,
+ zlib1g-dev, gawk, lzma, xz-utils, patchutils
 Vcs-Browser: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=crosstoolchain/crosstoolchain.git;a=tree
 Vcs-Git: https://alioth.debian.org/anonscm/git/crosstoolchain/crosstoolchain.git
 
diff --git a/cross-gcc-0.1/debian/rules b/cross-gcc-0.1/debian/rules
index c561f3e..daafe5a 100755
--- a/cross-gcc-0.1/debian/rules
+++ b/cross-gcc-0.1/debian/rules
@@ -16,18 +16,18 @@ ifeq ($(DISTRO),Debian)
 #TARGET_LIST ?= armhf armel arm64 mips mipsel powerpc i386 amd64
 TARGET_LIST ?= armhf
 HOST_LIST ?= amd64 i386
-GCC_BASE_VER ?=4.8
+BASE_VER_GCC ?= 4.8
 else # Ubuntu
 TARGET_LIST ?= armhf armel arm64
 HOST_LIST ?= amd64 i386
-BASE_VER_GCC ?=4.8
+BASE_VER_GCC ?= 4.8
 endif
 
 VER_GCC     := $(shell dpkg-parsechangelog -l/usr/src/gcc-$(BASE_VER_GCC)/debian/changelog | egrep '^Version:' | cut -f 2 -d ' '|cut -f 1 -d '-'|cut -d '.' -f1-3)
 PKG_VER_GCC := $(shell dpkg-parsechangelog -l/usr/src/gcc-$(BASE_VER_GCC)/debian/changelog | egrep '^Version:' | cut -f 2 -d ' '|cut -f 1 -d '-')
 DEB_VER_GCC := $(shell dpkg-parsechangelog -l/usr/src/gcc-$(BASE_VER_GCC)/debian/changelog | egrep '^Version:' | cut -f 2 -d ' ')
 
-GCC_DIR  := /usr/src/gcc
+GCC_DIR  := /usr/src/gcc-$(BASE_VER_GCC)
 
 # Don't try to build the HOST=TARGET (ie. non-cross) combination on/for this arch
 TARGETS := $(filter-out ${DEB_HOST_ARCH}, ${TARGET_LIST})
@@ -51,9 +51,9 @@ init: $(stamp)init
 
 $(stamp)init:
 	@echo START $@
-	$(call unpack_tarball, ${GCC_DIR}/gcc-$(BASE_VER_GCC)-${VER_GCC}.tar.xz)
+	$(call unpack_tarball, ${GCC_DIR}/gcc-${VER_GCC}-*.tar.xz)
 	set -e; \
-	cd gcc-$(BASE_VER_GCC)-${PKG_VER_GCC} ;\
+	cd gcc-${PKG_VER_GCC} ;\
 	cp -a ${GCC_DIR}/debian/ . ;\
 	if [ -n "$$(grep -v '^\#' ${CURDIR}/debian/patches/gcc/series)" ]; then \
 	  QUILT_PATCHES=${CURDIR}/debian/patches/gcc quilt push -a; \
@@ -64,9 +64,9 @@ $(stamp)init:
 $(stamp)build-%: $(stamp)init
 	@echo START $@
 	set -e; \
-	cd gcc-$(BASE_VER_GCC)-${PKG_VER_GCC}; \
-	DEB_TARGET_ARCH=$* dpkg-buildpackage -T control-stamp; \
-	WITH_SYSROOT=/ DEB_TARGET_ARCH=$* with_deps_on_target_arch_pkgs=yes dpkg-buildpackage -B -uc -us; \
+	cd gcc-${PKG_VER_GCC}; \
+	DEB_TARGET_ARCH=$* with_deps_on_target_arch_pkgs=yes DEB_CROSS_NO_BIARCH=yes dpkg-buildpackage -d -T control; \
+	DEB_TARGET_ARCH=$* with_deps_on_target_arch_pkgs=yes DEB_CROSS_NO_BIARCH=yes dpkg-buildpackage -B -uc -us -d; \
 	cd ..; \
 	touch $@
 
@@ -147,7 +147,7 @@ mangle-debian-files: $(stamp)debian-files-base repack-debs
 # Generate the control file from head plus stanza for each binary
 # Don't build binaries when HOST=TARGET
 
-control:
+control: debian/control.head.in debian/control.binary.in
 	cat debian/control.head.in > debian/control;
 	for DEB_TARGET_ARCH in $(TARGET_LIST); do \
 	    DEB_TARGET_GNU_TYPE=`dpkg-architecture -a$${DEB_TARGET_ARCH} -qDEB_HOST_GNU_TYPE -f 2>/dev/null`; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/crosstoolchain.git



More information about the Crosstoolchain-logs mailing list