[oe-commits] org.oe.dev merge of '18239eb8813140e4bf4a47f026a9ff1328685d29'
oe commit
openembedded-commits at lists.openembedded.org
Wed Feb 13 01:53:54 UTC 2008
merge of '18239eb8813140e4bf4a47f026a9ff1328685d29'
and '5322568ecee532657239a959db7be8e868de87f2'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2
ViewMTN: http://monotone.openembedded.org/revision/info/0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2
Files:
1
packages/libpcap/libpcap_0.9.6.bb
packages/libpcap/libpcap.inc
packages/libpcap/libpcap_0.9.3.bb
packages/libpcap/libpcap_0.9.5.bb
packages/rxtx/rxtx_2.1-7r2.bb
packages/swt/swt-gtk.inc
Diffs:
#
# mt diff -r18239eb8813140e4bf4a47f026a9ff1328685d29 -r0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2
#
#
#
# rename "packages/libpcap/libpcap_0.9.6.bb"
# to "packages/libpcap/libpcap.inc"
#
# add_file "packages/libpcap/libpcap_0.9.6.bb"
# content [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
#
# patch "packages/libpcap/libpcap.inc"
# from [722b9181c176704a1a8b52dcb63e595991e439fc]
# to [b3fa7b30b55bc1b58d98951e6af205002321959e]
#
# patch "packages/libpcap/libpcap_0.9.3.bb"
# from [763b8478be56b0a412ec922f2a53da47b3cc4442]
# to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
#
# patch "packages/libpcap/libpcap_0.9.5.bb"
# from [763b8478be56b0a412ec922f2a53da47b3cc4442]
# to [750ff592061ab45c7cc4a1cc20407fd1688a8e6f]
#
============================================================
--- packages/libpcap/libpcap_0.9.6.bb 750ff592061ab45c7cc4a1cc20407fd1688a8e6f
+++ packages/libpcap/libpcap_0.9.6.bb 750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -0,0 +1,3 @@
+require libpcap.inc
+
+PR = "r2"
============================================================
--- packages/libpcap/libpcap_0.9.6.bb 722b9181c176704a1a8b52dcb63e595991e439fc
+++ packages/libpcap/libpcap.inc b3fa7b30b55bc1b58d98951e6af205002321959e
@@ -1,12 +1,9 @@
-# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
DESCRIPTION = "Network Packet Capture Library"
HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
SECTION = "libs/network"
-PR = "r1"
+LICENSE = "BSD"
+DEPENDS = "flex-native bison-native"
-
# Don't forget to edit shared.patch to have the correct version number inside
SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
file://shared.patch;patch=1"
============================================================
--- packages/libpcap/libpcap_0.9.3.bb 763b8478be56b0a412ec922f2a53da47b3cc4442
+++ packages/libpcap/libpcap_0.9.3.bb 750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -1,32 +1,3 @@
-DESCRIPTION = "Network Packet Capture Library"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "libs/network"
-PR = "r1"
+require libpcap.inc
+PR = "r2"
-SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
- file://shared.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-pcap=linux"
-
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
-do_configure_prepend () {
- if [ ! -e acinclude.m4 ]; then
- cat aclocal.m4 > acinclude.m4
- fi
-}
-
-do_stage () {
- install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
- install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
- install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h
- oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/net
- ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h
- install -m 0644 acinclude.m4 ${STAGING_DATADIR}/aclocal/libpcap.m4
-}
============================================================
--- packages/libpcap/libpcap_0.9.5.bb 763b8478be56b0a412ec922f2a53da47b3cc4442
+++ packages/libpcap/libpcap_0.9.5.bb 750ff592061ab45c7cc4a1cc20407fd1688a8e6f
@@ -1,32 +1,3 @@
-DESCRIPTION = "Network Packet Capture Library"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "libs/network"
-PR = "r1"
+require libpcap.inc
+PR = "r2"
-SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
- file://shared.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-pcap=linux"
-
-CPPFLAGS_prepend = "-I${S} "
-CFLAGS_prepend = "-I${S} "
-CXXFLAGS_prepend = "-I${S} "
-
-do_configure_prepend () {
- if [ ! -e acinclude.m4 ]; then
- cat aclocal.m4 > acinclude.m4
- fi
-}
-
-do_stage () {
- install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
- install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
- install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h
- oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/net
- ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h
- install -m 0644 acinclude.m4 ${STAGING_DATADIR}/aclocal/libpcap.m4
-}
#
# mt diff -r5322568ecee532657239a959db7be8e868de87f2 -r0f81044fe7f22c4e80b9e840c9f9f4c6a6e8d1a2
#
#
#
# patch "packages/rxtx/rxtx_2.1-7r2.bb"
# from [261fb1dbbffc4e2294a5a6838e4defa40431abd5]
# to [feb6090d9eff9d3f7bfe883a3e6ac6a35893e0a5]
#
# patch "packages/swt/swt-gtk.inc"
# from [bcadfa700e7fc0872ab1d3a38e456f41e5ebefed]
# to [63792d964f1f171ba6f802dc502978513888f9d1]
#
============================================================
--- packages/rxtx/rxtx_2.1-7r2.bb 261fb1dbbffc4e2294a5a6838e4defa40431abd5
+++ packages/rxtx/rxtx_2.1-7r2.bb feb6090d9eff9d3f7bfe883a3e6ac6a35893e0a5
@@ -1,8 +1,12 @@ HOMEPAGE = "http://rxtx.org"
DESCRIPTION = "RXTX provides serial and parallel communication for Java applications"
LICENSE = "LGPL"
SECTION = "libs"
HOMEPAGE = "http://rxtx.org"
+PR = "r1"
+
+DEPENDS = "classpath classpath-native virtual/javac-native"
+
inherit autotools java-library
SRC_URI = "\
@@ -10,6 +14,15 @@ SRC_URI = "\
file://rxtx-fixes-from-debian.patch;patch=1 \
"
+do_compile() {
+ # Whatever configure detected it is completely unusable. So we override heavily.
+ oe_runmake \
+ JAVAH="gjavah -classpath \$(CLASSPATH) -d \$(DEST) -jni" \
+ JAR=gjar \
+ JAVAC="javac -classpath \$(CLASSPATH) -d \$(TOP)/ -O -source 1.3 -target 1.3" \
+ JAVAINCLUDEDIR=${STAGING_INCDIR}/classpath
+}
+
do_install() {
install -d ${D}/${libdir_jni}
install -d ${D}/${datadir_java}
============================================================
--- packages/swt/swt-gtk.inc bcadfa700e7fc0872ab1d3a38e456f41e5ebefed
+++ packages/swt/swt-gtk.inc 63792d964f1f171ba6f802dc502978513888f9d1
@@ -1,9 +1,9 @@ inherit java-library
DESCRIPTION = "SWT is an open source widget toolkit for Java designed to provide efficient, portable access to the user-interface facilities"
LICENSE = "CPL MPL LGPL"
inherit java-library
-DEPENDS = "cairo gtk+ atk libxtst"
+DEPENDS = "classpath-native cairo gtk+ atk libxtst"
S = "${WORKDIR}/swt-source"
@@ -36,7 +36,6 @@ do_install() {
oe_jarinstall swt.jar
oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar
- install -d ${D}${libdir_jni}
oe_libinstall -so libswt-atk-gtk-${SWTVERSION} ${D}/${libdir_jni}
oe_libinstall -so libswt-cairo-gtk-${SWTVERSION} ${D}/${libdir_jni}
oe_libinstall -so libswt-pi-gtk-${SWTVERSION} ${D}/${libdir_jni}
More information about the Openembedded-commits
mailing list