[oe-commits] org.oe.dev mtools: do not link with X11 (from Poky)

[hrw commit]

mtools: do not link with X11 (from Poky)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a796b081d8845fac70a8842df854fc7d82eb0b27
ViewMTN: http://monotone.openembedded.org/revision/info/a796b081d8845fac70a8842df854fc7d82eb0b27
Files:
1
packages/mtools/files/no-x11.patch
packages/mtools/mtools-native_3.9.9.bb
packages/mtools/mtools_3.9.9.bb
Diffs:

#
# mt diff -r0b0e89770e7b7c37acf2972e7d00aae7cf1d0f44 -ra796b081d8845fac70a8842df854fc7d82eb0b27
#
#
#
# add_file "packages/mtools/files/no-x11.patch"
#  content [1de3be008777c3687aa9c43b69fd8cdaa0cb6163]
# 
# patch "packages/mtools/mtools-native_3.9.9.bb"
#  from [d873957a4396bd9b37c52a8b1b01d2fe91435cf1]
#    to [6a9676185aaf5fc3424b861fac845b86e089dc99]
# 
# patch "packages/mtools/mtools_3.9.9.bb"
#  from [09a02390351b77d8c0672aaed2467a9ae4d5679c]
#    to [c33756fcba6df0c011a392de2f759ad9875bdda1]
#
============================================================
--- packages/mtools/files/no-x11.patch	1de3be008777c3687aa9c43b69fd8cdaa0cb6163
+++ packages/mtools/files/no-x11.patch	1de3be008777c3687aa9c43b69fd8cdaa0cb6163
@@ -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 at srcdir@ $(USERCFLAGS) 
+ CXXFLAGS  = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I at 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
============================================================
--- packages/mtools/mtools-native_3.9.9.bb	d873957a4396bd9b37c52a8b1b01d2fe91435cf1
+++ packages/mtools/mtools-native_3.9.9.bb	6a9676185aaf5fc3424b861fac845b86e089dc99
@@ -3,6 +3,5 @@ require mtools_${PV}.bb
 # Released under the MIT license (see packages/COPYING)
 
 require mtools_${PV}.bb
-S="${WORKDIR}/mtools-${PV}"
 
 inherit autotools native
============================================================
--- packages/mtools/mtools_3.9.9.bb	09a02390351b77d8c0672aaed2467a9ae4d5679c
+++ packages/mtools/mtools_3.9.9.bb	c33756fcba6df0c011a392de2f759ad9875bdda1
@@ -5,12 +5,15 @@ LICENSE="GPL"
 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 = "r4"
 
 SRC_URI="http://mtools.linux.lu/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"
+S = "${WORKDIR}/mtools-${PV}"
 
 inherit autotools
+
+EXTRA_OECONF = "--without-x"