diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-26 09:03:34 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-26 09:03:34 +0000 |
| commit | 4bca8a4ca39060913f58e7f50ea4b83aa8c586bd (patch) | |
| tree | 2f2c7602969b2a4db2d0e87fe9ca170c52d165c3 | |
| parent | 678bf73f1dfcde9a2b185396a0c8f11a7c73f207 (diff) | |
| download | openembedded-core-4bca8a4ca39060913f58e7f50ea4b83aa8c586bd.tar.gz openembedded-core-4bca8a4ca39060913f58e7f50ea4b83aa8c586bd.tar.bz2 openembedded-core-4bca8a4ca39060913f58e7f50ea4b83aa8c586bd.tar.xz openembedded-core-4bca8a4ca39060913f58e7f50ea4b83aa8c586bd.zip | |
mtools: do not link with X11
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4118 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/mtools/files/no-x11.patch | 19 | ||||
| -rw-r--r-- | meta/packages/mtools/mtools_3.9.9.bb | 5 |
2 files changed, 22 insertions, 2 deletions
diff --git a/meta/packages/mtools/files/no-x11.patch b/meta/packages/mtools/files/no-x11.patch new file mode 100644 index 000000000..300f43f00 --- /dev/null +++ b/meta/packages/mtools/files/no-x11.patch @@ -0,0 +1,19 @@ +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- mtools-3.9.9.orig/Makefile.in ++++ mtools-3.9.9/Makefile.in +@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) + CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS) + LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@ + ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS) +-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS) ++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS) + X_CCFLAGS = $(X_CFLAGS) $(CFLAGS) + + all: mtools $(LINKS) mkmanifest @FLOPPYD@ + + %.o: %.c diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/packages/mtools/mtools_3.9.9.bb index 29132c642..235df5cd1 100644 --- a/meta/packages/mtools/mtools_3.9.9.bb +++ b/meta/packages/mtools/mtools_3.9.9.bb @@ -5,12 +5,13 @@ DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them." HOMEPAGE="http://mtools.linux.lu" LICENSE="GPL" -PR = "r2" +PR = "r3" #http://mtools.linux.lu/mtools-${PV}.tar.gz SRC_URI="http://folks.o-hand.com/richard/poky/sources/mtools-${PV}.tar.gz \ file://mtools-makeinfo.patch;patch=1 \ - file://mtools.patch;patch=1" + file://mtools.patch;patch=1 \ + file://no-x11.patch;patch=1" #DEPENDS = "tetex-native" |