diff options
| -rw-r--r-- | packages/gcc/gcc-cross_4.0.0.bb | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc_4.0.0.bb | 5 | ||||
| -rw-r--r-- | packages/maemo/sapwood/cflags.patch | 17 | ||||
| -rw-r--r-- | packages/maemo/sapwood/sockets.patch | 0 | ||||
| -rw-r--r-- | packages/maemo/sapwood_1.20-1.bb | 17 |
5 files changed, 38 insertions, 3 deletions
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 7c2c04a7c1..6e299e8299 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r0" +PR = "r1" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb index 6c07772fd4..15f307c320 100644 --- a/packages/gcc/gcc_4.0.0.bb +++ b/packages/gcc/gcc_4.0.0.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -11,6 +11,7 @@ inherit autotools gettext include gcc-package.inc -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ + file://ldflags.patch;patch=1" include gcc4-build.inc diff --git a/packages/maemo/sapwood/cflags.patch b/packages/maemo/sapwood/cflags.patch index e69de29bb2..841a9dd350 100644 --- a/packages/maemo/sapwood/cflags.patch +++ b/packages/maemo/sapwood/cflags.patch @@ -0,0 +1,17 @@ +--- src/Makefile.am.old 2005-06-09 19:25:34.000000000 +0200 ++++ src/Makefile.am 2005-06-09 19:27:14.000000000 +0200 +@@ -19,12 +19,14 @@ + + libsapwood_la_LDFLAGS = -avoid-version -module -Wl,-z,defs + libsapwood_la_LIBADD = $(GTK_LIBS) ++libsapwood_la_CFLAGS = $(AM_CFLAGS) + + daemondir = $(libdir)/sapwood + daemon_PROGRAMS = sapwood-server + + sapwood_server_SOURCES = sapwood-server.c sapwood-proto.c sapwood-proto.h + sapwood_server_LDADD = $(GDK_LIBS) ++sapwood_server_CFLAGS = $(AM_CFLAGS) + + MAINTAINERCLEANFILES = Makefile.in + diff --git a/packages/maemo/sapwood/sockets.patch b/packages/maemo/sapwood/sockets.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo/sapwood/sockets.patch diff --git a/packages/maemo/sapwood_1.20-1.bb b/packages/maemo/sapwood_1.20-1.bb index e69de29bb2..f024b09f85 100644 --- a/packages/maemo/sapwood_1.20-1.bb +++ b/packages/maemo/sapwood_1.20-1.bb @@ -0,0 +1,17 @@ +PR = "r0" +LICENSE = "GPL" +SECTION = "x11/base" +DESCRIPTION = "GTK theme engine Sapwood" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +DEPENDS = "gtk+-2.6.4-1.osso7" + +FILES_${PN} += "${libdir}/gtk-2.0/2.4.0/engines/" + +SRC_URI = "http://stage.maemo.org/pool/maemo/ossw/source/s/${PN}/${PN}_${PV}.tar.gz \ + file://cflags.patch;patch=1;pnum=0 \ + file://sockets.patch;patch=1;pnum=0" + +S = ${WORKDIR}/${PN}-1.20 +EXTRA_OECONF = "--enable-abstract-sockets=no" + +inherit autotools pkgconfig |