From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 4 Sep 2010 14:26:32 +0000 (+0200)
Subject: Merge branch 'x-fixes' into ms-no-toolchain
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2880daea1fbc0a4a564cd3be3fe0ebd8bd90fc7;p=ipfire-3.x.git

Merge branch 'x-fixes' into ms-no-toolchain

Conflicts:
	pkgs/core/gcc/gcc.nm
	pkgs/core/libassuan/libassuan.nm
	pkgs/toolchain/gcc-static/gcc-static.nm
	pkgs/toolchain/gcc/gcc.nm
---

e2880daea1fbc0a4a564cd3be3fe0ebd8bd90fc7
diff --cc pkgs/core/dbus/dbus.nm
index 1ea095b2e,b0cf158f4..ba149e13f
--- a/pkgs/core/dbus/dbus.nm
+++ b/pkgs/core/dbus/dbus.nm
@@@ -42,12 -42,8 +42,12 @@@ define PKG_DESCRIPTIO
  	per-user-login-session messaging facility.
  endef
  
- PKG_TARBALL    = $(THISAPP).tar.gz
+ PKG_TARBALL    = $(THISAPP).885483.tar.gz
  
 +PKG_PACKAGES  += $(PKG_NAME)-devel $(PKG_NAME)-libs
 +
 +PKG_FILES-$(PKG_NAME)-devel += /usr/lib/dbus-1.0
 +
  CONFIGURE_OPTIONS += \
  	--sysconfdir=/etc \
  	--localstatedir=/var \
diff --cc pkgs/core/gcc/gcc.nm
index 0007b0a05,14fe53c11..05bda5f86
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@@ -53,40 -52,11 +53,40 @@@ els
  	CONFIG_CPU = --with-cpu=$(TARGET_MACHINE) --with-arch=$(TARGET_MACHINE)
  endif
  
- PKG_TARBALL   += $(THISAPP).tar.bz2
+ PKG_TARBALL   += $(THISAPP).tar.gz
  
 -###############################################################################
 -# Installation Details
 -###############################################################################
 +# A package for C++
 +PKG_PACKAGES += $(PKG_NAME)-c++
 +PKG_DEPS-$(PKG_NAME)-c++ = gcc libstdc++-devel
 +define PKG_FILES-$(PKG_NAME)-c++
 +	/usr/bin/*++
 +	/usr/lib/gcc/*/*/cc1plus
 +	/usr/share/man/man*/*++*
 +endef
 +
 +# libgcc
 +PKG_PACKAGES += libgcc
 +define PKG_FILES-libgcc
 +	/usr/lib/libgcc*.so.*
 +endef
 +
 +PKG_PACKAGES += libgcc-devel
 +define PKG_FILES-libgcc-devel
 +	/usr/lib/libgcc*.so
 +endef
 +
 +# libstdc++
 +PKG_PACKAGES += libstdc++
 +define PKG_FILES-libstdc++
 +	/usr/lib/libstdc++*.so.*
 +endef
 +
 +PKG_PACKAGES += libstdc++-devel
 +define PKG_FILES-libstdc++-devel
 +	/usr/include/c++
 +	/usr/lib/libstdc++*.so
 +endef
 +
  
  define STAGE_PREPARE_CMDS
  	-mkdir -v $(DIR_SRC)/gcc-build
diff --cc pkgs/core/libassuan/libassuan.nm
index 53a9b4b06,a8e5bb6c8..5eff57bd3
--- a/pkgs/core/libassuan/libassuan.nm
+++ b/pkgs/core/libassuan/libassuan.nm
@@@ -46,9 -46,3 +46,12 @@@ define PKG_DESCRIPTIO
  endef
  
  PKG_TARBALL    = $(THISAPP).tar.bz2
++<<<<<<< HEAD
 +
 +PKG_PACKAGES  += $(PKG_NAME)-devel
 +
 +define STAGE_PREPARE_CMDS
 +	cd $(DIR_APP) && autoreconf --install
 +endef
++=======
++>>>>>>> x-fixes
diff --cc pkgs/core/pixman/pixman.nm
index 0eb5fa53b,da92016c2..e7a1e0f42
--- a/pkgs/core/pixman/pixman.nm
+++ b/pkgs/core/pixman/pixman.nm
@@@ -40,10 -40,8 +40,10 @@@ define PKG_DESCRIPTIO
  	Pixman is a pixel manipulation library for X and cairo.
  endef
  
- PKG_TARBALL    = $(THISAPP).tar.bz2
+ PKG_TARBALL    = $(THISAPP).tar.gz
  
 +PKG_PACKAGES  += $(PKG_NAME)-devel
 +
  # XXX double check this later on
  ifeq "$(TARGET)" "via-c7"
  	CONFIGURE_OPTIONS += --enable-mmx #--enable-sse2