diff options
| author |   Robert Schuster <robertschuster@fsfe.org> | 2010-02-08 11:37:10 +0100 |
|---|---|---|
| committer | Robert Schuster <robertschuster@fsfe.org> | 2010-02-08 11:39:18 +0100 |
| commit | 0feaefef7b2b4d9c023cdce9268f08e2dfcb4721 (patch) | |
| tree | 9c41d7bd91d4997e7771c5b2fca2ecdd23a9bd8c | |
| parent | 344932973dd924fa92e6e4b85ff648a9a699724d (diff) | |
| download | openembedded-0feaefef7b2b4d9c023cdce9268f08e2dfcb4721.tar.gz | |
swt-gtk.inc: Properly give OE's LDFLAGS to makefile.
swt3.3-gtk: Increased PR.
swt3.3-gtk-hildon: Dito.
swt3.4-gtk: Dito.
swt3.4-gtk-hildon: Dito.
| -rw-r--r-- | recipes/swt/swt-gtk.inc | 4 | ||||
| -rw-r--r-- | recipes/swt/swt3.3-gtk_3.3.1.bb | 2 | ||||
| -rw-r--r-- | recipes/swt/swt3.4-gtk-hildon_3.4.2.bb | 2 | ||||
| -rw-r--r-- | recipes/swt/swt3.4-gtk-hildon_3.4.bb | 2 | ||||
| -rw-r--r-- | recipes/swt/swt3.4-gtk_3.4.2.bb | 2 | ||||
| -rw-r--r-- | recipes/swt/swt3.4-gtk_3.4.bb | 2 |
6 files changed, 9 insertions, 5 deletions
diff --git a/recipes/swt/swt-gtk.inc b/recipes/swt/swt-gtk.inc index eed628a313..1c26a397c2 100644 --- a/recipes/swt/swt-gtk.inc +++ b/recipes/swt/swt-gtk.inc @@ -22,8 +22,12 @@ do_unpackpost() { unzip -o ../src.zip cp ../Makefile . + # Sets version numbers for native libraries. sed -i -e "s|RELEASE=OE_SWT_RELEASE|RELEASE=${PV}|" Makefile sed -i -e "s|SONAME_VERSION=OE_SWT_API_VERSION|SONAME_VERSION=${SWT_API_VERSION}|" Makefile + + # Properly applies OE's LDFLAGS to linking step. + sed -i -e "s|LIBS = -shared -fPIC|LIBS = -shared ${LDFLAGS}|" make_linux.mak } do_compile() { diff --git a/recipes/swt/swt3.3-gtk_3.3.1.bb b/recipes/swt/swt3.3-gtk_3.3.1.bb index 82860edfb3..f6624b3cad 100644 --- a/recipes/swt/swt3.3-gtk_3.3.1.bb +++ b/recipes/swt/swt3.3-gtk_3.3.1.bb @@ -1,6 +1,6 @@ require swt-gtk.inc -PR = "r1" +PR = "r2" SRC_URI = "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-${PV}-200710231652/swt-${PV}-gtk-linux-x86.zip \ file://Makefile" diff --git a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb index 667e516fa0..d834a58157 100644 --- a/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb +++ b/recipes/swt/swt3.4-gtk-hildon_3.4.2.bb @@ -1,6 +1,6 @@ require swt3.4-gtk_${PV}.bb -PR = "r0" +PR = "r1" DEPENDS += "libhildon libhildonfm" diff --git a/recipes/swt/swt3.4-gtk-hildon_3.4.bb b/recipes/swt/swt3.4-gtk-hildon_3.4.bb index d834a58157..ffccd5a339 100644 --- a/recipes/swt/swt3.4-gtk-hildon_3.4.bb +++ b/recipes/swt/swt3.4-gtk-hildon_3.4.bb @@ -1,6 +1,6 @@ require swt3.4-gtk_${PV}.bb -PR = "r1" +PR = "r2" DEPENDS += "libhildon libhildonfm" diff --git a/recipes/swt/swt3.4-gtk_3.4.2.bb b/recipes/swt/swt3.4-gtk_3.4.2.bb index f4b6a85f37..cac36773b5 100644 --- a/recipes/swt/swt3.4-gtk_3.4.2.bb +++ b/recipes/swt/swt3.4-gtk_3.4.2.bb @@ -1,6 +1,6 @@ require swt-gtk.inc -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/swt-3.4.2-gtk-linux-x86.zip \ file://Makefile" diff --git a/recipes/swt/swt3.4-gtk_3.4.bb b/recipes/swt/swt3.4-gtk_3.4.bb index b6eafcad8c..c7a534b7ad 100644 --- a/recipes/swt/swt3.4-gtk_3.4.bb +++ b/recipes/swt/swt3.4-gtk_3.4.bb @@ -1,6 +1,6 @@ require swt-gtk.inc -PR = "r0" +PR = "r1" SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \ file://Makefile" |