From 29ebfef2e92b229f2ba91e0cbfe85ad43dee6458 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 22 Oct 2008 12:04:33 +0200 Subject: unicap: 0.9.3 Work around library renaming issue. --- packages/unicap/unicap_0.9.3.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/unicap/unicap_0.9.3.bb b/packages/unicap/unicap_0.9.3.bb index c527c80819..dcc0897aa8 100644 --- a/packages/unicap/unicap_0.9.3.bb +++ b/packages/unicap/unicap_0.9.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A uniform interface to video capture devices." SECTION = "graphics" LICENSE = "GPL" DEPENDS = "intltool-native gtk+ libpng libxv" -PR = "r0" +PR = "r1" SRC_URI = "http://www.unicap-imaging.org/downloads/unicap-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" @@ -13,10 +13,10 @@ do_stage () { autotools_stage_all } -PACKAGES += "libucil libunicapgtk" +PACKAGES += "libucil unicapgtk" FILES_${PN} = "${libdir}/libunicap.*so.* ${libdir}/unicap2/cpi/lib*.*so.*" FILES_${PN}-dev += " ${libdir}/unicap2/cpi/lib*.*so ${libdir}/unicap2/cpi/lib*.*a" FILES_${PN}-dbg += " ${libdir}/unicap2/cpi/.debug" FILES_libucil = "${libdir}/libucil*so.*" -FILES_libunicapgtk = "${libdir}/libunicapgtk*so.*" +FILES_unicapgtk = "${libdir}/libunicapgtk*so.*" -- cgit v1.2.3 From b5a531d6dea1892de33245958ca362762b1574d1 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 22 Oct 2008 12:08:35 +0200 Subject: fswebcam: A command line tool for image capture and processing - add 20070108 code relase. --- packages/fswebcam/fswebcam_20070108.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 packages/fswebcam/fswebcam_20070108.bb diff --git a/packages/fswebcam/fswebcam_20070108.bb b/packages/fswebcam/fswebcam_20070108.bb new file mode 100644 index 0000000000..e24dbf3533 --- /dev/null +++ b/packages/fswebcam/fswebcam_20070108.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Webcam imaage grabber and manipulation application." +SECTION = "graphics" +DEPENDS = "gd" +LICENSE = "GPL" + +PR = "r0" + +inherit autotools + +SRC_URI = "http://www.firestorm.cx/fswebcam/files/${P}.tar.gz" -- cgit v1.2.3 From 6002b6e0652a9f93d4eb3bed65412fc7c1a4210c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 22 Oct 2008 12:11:02 +0200 Subject: linux-omap2: add forced module loading support for beagle --- packages/linux/linux-omap2-git/beagleboard/defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index c726740485..413167de7e 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Thu Sep 25 07:42:19 2008 +# Wed Oct 22 12:01:26 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -97,7 +97,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y -- cgit v1.2.3 From a1825f04c3b8b98a66ae402e99fd40ff2be59c82 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 22 Oct 2008 13:12:15 +0200 Subject: machines: start moving PACKAGE_EXTRA_ARCHS into the appropriate tune files * machine maintainers are encouraged to fix their machines --- conf/machine/acern30.conf | 1 - conf/machine/amsdelta.conf | 1 - conf/machine/asus620.conf | 1 - conf/machine/asus730.conf | 2 +- conf/machine/at91-l9260.conf | 1 - conf/machine/at91sam9260ek.conf | 1 - conf/machine/at91sam9261ek.conf | 1 - conf/machine/at91sam9263ek.conf | 1 - conf/machine/aximx50.conf | 2 +- conf/machine/bd-neon.conf | 1 - conf/machine/beagleboard.conf | 3 +-- conf/machine/chumby.conf | 1 - conf/machine/cm-x270.conf | 2 +- conf/machine/cs-e9302.conf | 1 - conf/machine/davinci-dvevm.conf | 1 - conf/machine/davinci-sffsdr.conf | 1 - conf/machine/devkitidp-pxa255.conf | 1 - conf/machine/em-x270.conf | 2 +- conf/machine/ep93xx.conf | 1 - conf/machine/er0100.conf | 1 - conf/machine/eseries.conf | 1 - conf/machine/eteng500.conf | 1 - conf/machine/fsg3be.conf | 2 +- conf/machine/gesbc-9302.conf | 1 - conf/machine/ghi270.conf | 2 +- conf/machine/h1910.conf | 1 - conf/machine/h1940.conf | 1 - conf/machine/h2200.conf | 1 - conf/machine/h3900.conf | 1 - conf/machine/h4000.conf | 1 - conf/machine/h5000.conf | 1 - conf/machine/h6300.conf | 1 - conf/machine/htcalpine.conf | 1 - conf/machine/htcapache.conf | 1 - conf/machine/htcblueangel.conf | 1 - conf/machine/htchimalaya.conf | 1 - conf/machine/htckaiser.conf | 6 +----- conf/machine/hx4700.conf | 2 +- conf/machine/include/motorola-ezx-base.inc | 1 - conf/machine/include/tune-arm1136jf-s.inc | 2 ++ conf/machine/include/tune-arm920t.inc | 1 + conf/machine/include/tune-arm926ejs.inc | 2 +- conf/machine/include/tune-arm9tdmi.inc | 1 + conf/machine/include/tune-armv7.inc | 1 + conf/machine/include/tune-athlonmp.inc | 1 + conf/machine/include/tune-c3.inc | 1 + conf/machine/include/tune-cortexa8.inc | 1 + conf/machine/include/tune-ep9312.inc | 1 + conf/machine/include/tune-iwmmxt.inc | 2 +- conf/machine/include/tune-pentium.inc | 2 +- conf/machine/include/tune-pentiumpro.inc | 2 +- conf/machine/include/tune-xscale.inc | 1 + conf/machine/include/zaurus-2.6.inc | 1 - conf/machine/neuros-osd.conf | 2 -- conf/machine/neuros-osd2.conf | 2 -- conf/machine/nokia770.conf | 1 - conf/machine/nokia800.conf | 1 - 57 files changed, 23 insertions(+), 55 deletions(-) diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf index 22718b806e..add59a4f45 100644 --- a/conf/machine/acern30.conf +++ b/conf/machine/acern30.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 349dd8eddb..e1ad289b40 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Amstrad E3 TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf index ef7e8a2a39..8ec0d9a999 100644 --- a/conf/machine/asus620.conf +++ b/conf/machine/asus620.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf index 814641df8f..d4712032db 100644 --- a/conf/machine/asus730.conf +++ b/conf/machine/asus730.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" +PACKAGE_EXTRA_ARCHS = "iwmmxt" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf index 16d0705a24..f95fb2da56 100644 --- a/conf/machine/at91-l9260.conf +++ b/conf/machine/at91-l9260.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.25" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index ba0c9f9a70..59ef577480 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index 3b9d5188f6..570ff165f7 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index 95c7626a63..9fd34f95a0 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf index b119a24359..6247c8322c 100644 --- a/conf/machine/aximx50.conf +++ b/conf/machine/aximx50.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +PACKAGE_EXTRA_ARCHS = " iwmmxt " # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf index f875d437c7..9578389890 100644 --- a/conf/machine/bd-neon.conf +++ b/conf/machine/bd-neon.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index d32578ed87..548cf764d1 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -2,7 +2,6 @@ #@NAME: Beagleboard machine #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -29,7 +28,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS2" # No kernel recipe yet -PREFERRED_PROVIDER_virtual/kernel = "linux-omap" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf index a1d6d43600..cef6dbc147 100644 --- a/conf/machine/chumby.conf +++ b/conf/machine/chumby.conf @@ -7,7 +7,6 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi" GUI_MACHINE_CLASS = "smallscreen" -PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index aadbea4a5f..e01b37d3e6 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -7,7 +7,7 @@ GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" +PACKAGE_EXTRA_ARCHS = " iwmmxt" require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/cs-e9302.conf b/conf/machine/cs-e9302.conf index b99b1372be..838dbce62e 100644 --- a/conf/machine/cs-e9302.conf +++ b/conf/machine/cs-e9302.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for Olimex CS-E9302 Development Platform TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux" diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf index b279338686..c926c6ff8a 100644 --- a/conf/machine/davinci-dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the TI Davinci EVM board TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" HOTPLUG = "udev" diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index efaffb088b..4ead8c1508 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the Lyrtech Small Form Factor SDR board TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" HOTPLUG = "udev" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index db9f26861c..65f6584662 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "bigscreen" -PACKAGE_EXTRA_ARCHS = "armv4 armv5te" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf index 3cf0a7fab2..f8a5c951b7 100644 --- a/conf/machine/em-x270.conf +++ b/conf/machine/em-x270.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +PACKAGE_EXTRA_ARCHS = "iwmmxt " PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 16d8c7097c..268ed52b61 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -4,7 +4,6 @@ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf index 211091d929..f20d6ae8e3 100644 --- a/conf/machine/er0100.conf +++ b/conf/machine/er0100.conf @@ -9,7 +9,6 @@ # CPU: Intel (now Marvell) PXA255 TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/eseries.conf b/conf/machine/eseries.conf index e6552b52d1..48beedd175 100644 --- a/conf/machine/eseries.conf +++ b/conf/machine/eseries.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " #Compile with armv5te optimizations, incompatible with armv4(t) cpus require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/eteng500.conf b/conf/machine/eteng500.conf index 91e3dbb5a0..e362bdec00 100644 --- a/conf/machine/eteng500.conf +++ b/conf/machine/eteng500.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU require conf/machine/include/tune-arm920t.inc diff --git a/conf/machine/fsg3be.conf b/conf/machine/fsg3be.conf index c6859227cb..a2ca95beac 100644 --- a/conf/machine/fsg3be.conf +++ b/conf/machine/fsg3be.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "armeb" -PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" +PACKAGE_EXTRA_ARCHS = "ixp4xxbe" MACHINE_ARCH = "ixp4xxbe" diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf index ac4c1ef4b6..db255a670c 100644 --- a/conf/machine/gesbc-9302.conf +++ b/conf/machine/gesbc-9302.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux ?= "2.6.24" diff --git a/conf/machine/ghi270.conf b/conf/machine/ghi270.conf index 3536485cab..af4ddea21c 100644 --- a/conf/machine/ghi270.conf +++ b/conf/machine/ghi270.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +PACKAGE_EXTRA_ARCHS = " iwmmxt " # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 439c484970..43d23d8d91 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 99e82d28f4..eec87a3ed5 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -2,7 +2,6 @@ #@NAME: h1940 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940 -PACKAGE_EXTRA_ARCHS = "armv4 armv4t" TARGET_ARCH = "arm" # Set preferred providers diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 4c7e413fa0..abc17728b5 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " #Compile with armv5te optimizations, incompatible with armv4(t) cpus require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 8b9b7ee365..a403008a18 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 03dccedccc..f85b2a12ee 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index a55b75cd89..73fbf1708d 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 4657d48b79..08f61b83ea 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -7,7 +7,6 @@ # TARGET_ARCH = "arm" BASE_PACKAGE_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc require conf/machine/include/tune-arm9tdmi.inc diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index f7f025413d..a9791dd8ef 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index b3debb633c..d4a0bd19b8 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index f95cb70833..a5178d8c90 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 472e5d69e6..384f1f9d14 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -6,7 +6,6 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.inc diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf index eba677fae7..1d6cde4536 100644 --- a/conf/machine/htckaiser.conf +++ b/conf/machine/htckaiser.conf @@ -2,7 +2,6 @@ #@NAME: HTC Kaiser phone #@DESCRIPTION: Machine configuration for HTC Kaiser phone TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" @@ -11,10 +10,7 @@ GUI_MACHINE_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" -FEED_ARCH = "armv6" -BASE_PACKAGE_ARCH = "armv6" - +require conf/machine/include/tune-arm1136jf-s.inc IMAGE_FSTYPES ?= "tar.gz cpio.gz" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 785214409f..ab532e33ff 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +PACKAGE_EXTRA_ARCHS = " iwmmxt " IMAGE_FSTYPES += "jffs2" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 52c2b04690..296ce6a2ed 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -1,5 +1,4 @@ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx" diff --git a/conf/machine/include/tune-arm1136jf-s.inc b/conf/machine/include/tune-arm1136jf-s.inc index 0f5aef5ea4..e7b8f71c33 100644 --- a/conf/machine/include/tune-arm1136jf-s.inc +++ b/conf/machine/include/tune-arm1136jf-s.inc @@ -1,3 +1,5 @@ TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv6" BASE_PACKAGE_ARCH = "armv6" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6" + diff --git a/conf/machine/include/tune-arm920t.inc b/conf/machine/include/tune-arm920t.inc index 1f7a04bb3b..47275b8cb4 100644 --- a/conf/machine/include/tune-arm920t.inc +++ b/conf/machine/include/tune-arm920t.inc @@ -1,4 +1,5 @@ FEED_ARCH = "armv4t" BASE_PACKAGE_ARCH = "armv4t" TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t" diff --git a/conf/machine/include/tune-arm926ejs.inc b/conf/machine/include/tune-arm926ejs.inc index e80ef10490..f41e460999 100644 --- a/conf/machine/include/tune-arm926ejs.inc +++ b/conf/machine/include/tune-arm926ejs.inc @@ -1,5 +1,5 @@ FEED_ARCH = "armv5te" - +PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te" # For gcc 3.x you need: #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" # For gcc 4.x you need: diff --git a/conf/machine/include/tune-arm9tdmi.inc b/conf/machine/include/tune-arm9tdmi.inc index 50aaec1320..d788b5304f 100644 --- a/conf/machine/include/tune-arm9tdmi.inc +++ b/conf/machine/include/tune-arm9tdmi.inc @@ -1,3 +1,4 @@ FEED_ARCH = "armv4t" BASE_PACKAGE_ARCH = "armv4t" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t" TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc index 96c8c64904..379a3eb011 100644 --- a/conf/machine/include/tune-armv7.inc +++ b/conf/machine/include/tune-armv7.inc @@ -3,4 +3,5 @@ # This will NOT compile programs in 'ARM' mode, which is what you really want TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" FEED_ARCH = "armv7" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7" BASE_PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-athlonmp.inc b/conf/machine/include/tune-athlonmp.inc index 313300d9cd..9526faad7e 100644 --- a/conf/machine/include/tune-athlonmp.inc +++ b/conf/machine/include/tune-athlonmp.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-march=i686" +PACKAGE_EXTRA_ARCHS += "i386 i486 i586" BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" diff --git a/conf/machine/include/tune-c3.inc b/conf/machine/include/tune-c3.inc index 43849086f4..136efa247c 100644 --- a/conf/machine/include/tune-c3.inc +++ b/conf/machine/include/tune-c3.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-march=c3 -mtune=c3" +PACKAGE_EXTRA_ARCHS += "i386 i486" BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 4216255102..a2ce7def1a 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -5,4 +5,5 @@ TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" FEED_ARCH = "armv7a" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a" BASE_PACKAGE_ARCH = "armv7a" diff --git a/conf/machine/include/tune-ep9312.inc b/conf/machine/include/tune-ep9312.inc index 7da1cb50c8..39d7f9b797 100644 --- a/conf/machine/include/tune-ep9312.inc +++ b/conf/machine/include/tune-ep9312.inc @@ -2,6 +2,7 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" # add "-mfp=maverick" for newer gcc versions > 4.0 #set arch to ep9312 for all generated packages +PACKAGE_EXTRA_ARCHS += "armv4 armv4t ep9312" BASE_PACKAGE_ARCH = "ep9312" FEED_ARCH = "ep9312" diff --git a/conf/machine/include/tune-iwmmxt.inc b/conf/machine/include/tune-iwmmxt.inc index aa5aaee901..f7291be805 100644 --- a/conf/machine/include/tune-iwmmxt.inc +++ b/conf/machine/include/tune-iwmmxt.inc @@ -2,6 +2,6 @@ # Please use tune-xscale for PXA255/PXA26x based processors. TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" BASE_PACKAGE_ARCH = "iwmmxt" -PACKAGE_EXTRA_ARCHS += "iwmmxt" +PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te iwmmxt" FEED_ARCH = "iwmmxt" diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc index 6b8c9b521f..4e5be154dd 100644 --- a/conf/machine/include/tune-pentium.inc +++ b/conf/machine/include/tune-pentium.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentium" BASE_PACKAGE_ARCH = "i586" FEED_ARCH = "i586" - +PACKAGE_EXTRA_ARCHS += "i386 i486" diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc index 88fe7d7445..63dda25f58 100644 --- a/conf/machine/include/tune-pentiumpro.inc +++ b/conf/machine/include/tune-pentiumpro.inc @@ -1,4 +1,4 @@ TARGET_CC_ARCH = "-march=pentiumpro" BASE_PACKAGE_ARCH = "i686" FEED_ARCH = "i686" - +PACKAGE_EXTRA_ARCHS += "i386 i486 i586" diff --git a/conf/machine/include/tune-xscale.inc b/conf/machine/include/tune-xscale.inc index eb16651ae3..bd445c6385 100644 --- a/conf/machine/include/tune-xscale.inc +++ b/conf/machine/include/tune-xscale.inc @@ -2,4 +2,5 @@ FEED_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" +PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index a688f2f64b..a861195dd1 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -2,7 +2,6 @@ # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" PACKAGE_EXTRA_ARCHS_collie = "" MACHINE_KERNEL_VERSION = "2.6" diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf index 09a71535c6..5f965286f6 100644 --- a/conf/machine/neuros-osd.conf +++ b/conf/machine/neuros-osd.conf @@ -4,8 +4,6 @@ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" - PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-neuros" diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index 05fb2e19e5..f852a9e82b 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -4,8 +4,6 @@ TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" - PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-neuros" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 15126d56a9..8d6073353a 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -2,7 +2,6 @@ #@NAME: Nokia 770 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" PREFERRED_PROVIDER_virtual/bootloader = "" diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index afdf0ac621..69b94301e6 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -2,7 +2,6 @@ #@NAME: Nokia 800 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 800 TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" XSERVER = "xserver-kdrive-xomap" -- cgit v1.2.3 From 96c8f0b866225166b435067b29daf2d8c7fb77b1 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 16 Oct 2008 11:59:20 +0200 Subject: java-library.bbclass: Remove superfluous quotes from BPN variable. --- classes/java-library.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index eced939ef0..1e5534cbfe 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -49,7 +49,7 @@ FILES_${JPN} = "${datadir_java}" # Base package name # Automatically derives "foo" from "foo-native" -BPN ?= ""${@java_base_package_name(d)}"" +BPN ?= "${@java_base_package_name(d)}" BP ?= "${BPN}-${PV}" -- cgit v1.2.3 From 0f2eecb6a8346e73c1bcb9b29a9bcadd03ef812c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 16 Oct 2008 20:45:46 +0200 Subject: giflib 4.1.6: New recipe. --- packages/giflib/giflib_4.1.6.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/giflib/giflib_4.1.6.bb diff --git a/packages/giflib/giflib_4.1.6.bb b/packages/giflib/giflib_4.1.6.bb new file mode 100644 index 0000000000..0f4223c76a --- /dev/null +++ b/packages/giflib/giflib_4.1.6.bb @@ -0,0 +1,18 @@ +SECTION = "libs" +DESCRIPTION = "shared library for GIF images" +SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.bz2" +LICENSE = "MIT" +PR = "r1" + +PACKAGES += "${PN}-utils" + +FILES_${PN} = "${libdir}" +FILES_${PN}-utils = "${bindir}" + +inherit autotools + +do_stage() { + oe_libinstall -so -C lib/.libs libgif ${STAGING_LIBDIR} + + install -m 0644 lib/gif_lib.h ${STAGING_INCDIR}/ +} -- cgit v1.2.3 From 5f1c5c8149d0e70a3522a6fe11edb0c76af9c886 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 16 Oct 2008 20:49:29 +0200 Subject: [checksums]: Added giflib 4.1.6 entry. --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index c8bebc7fb3..ee67ee560b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4430,6 +4430,10 @@ sha256=42eb6bff68e88ef12a7ac2aa69848aeb29a8b69176b3bd3d9d67cf9a1233fe85 md5=c810ef5389baf24882a1caca2954385e sha256=176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac +[http://downloads.sourceforge.net/giflib/giflib-4.1.6.tar.bz2] +md5=7125644155ae6ad33dbc9fc15a14735f +sha256=e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed + [http://www.catb.org/~esr/gif2png/gif2png-2.5.1.tar.gz] md5=85bb8ee345fc41c218de19dda0164806 sha256=90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89 -- cgit v1.2.3 From facb73755f28d3281f8a0cfd73d95cf638eb3eda Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 16 Oct 2008 22:25:22 +0200 Subject: lesstif 0.95.0: New recipe. --- packages/lesstif/files/000_bootstrap_script.diff | 30 + packages/lesstif/files/000_libtool_linking.diff | 11 + packages/lesstif/files/010_rebootstrap-small.diff | 456 + packages/lesstif/files/010_rebootstrap.diff | 69586 +++++++++++++++++++ packages/lesstif/files/020_bad_integer_cast.diff | 13 + packages/lesstif/files/020_missing_xm_h.diff | 11 + packages/lesstif/files/020_render_table_crash.diff | 11 + packages/lesstif/files/020_unsigned_int.diff | 38 + packages/lesstif/files/020_xpmpipethrough.diff | 381 + .../lesstif/files/021_xim_chained_list_crash.diff | 24 + packages/lesstif/files/030_manpage.diff | 11 + packages/lesstif/files/ac_debug.m4.diff | 95 + packages/lesstif/files/ac_find_xft.m4.diff | 304 + packages/lesstif/files/ac_have_libxp.m4.diff | 57 + packages/lesstif/files/aclocal.m4.diff | 2746 + packages/lesstif/files/disable-docs.patch | 29 + packages/lesstif/lesstif_0.95.0.bb | 49 + 17 files changed, 73852 insertions(+) create mode 100644 packages/lesstif/files/000_bootstrap_script.diff create mode 100644 packages/lesstif/files/000_libtool_linking.diff create mode 100644 packages/lesstif/files/010_rebootstrap-small.diff create mode 100644 packages/lesstif/files/010_rebootstrap.diff create mode 100644 packages/lesstif/files/020_bad_integer_cast.diff create mode 100644 packages/lesstif/files/020_missing_xm_h.diff create mode 100644 packages/lesstif/files/020_render_table_crash.diff create mode 100644 packages/lesstif/files/020_unsigned_int.diff create mode 100644 packages/lesstif/files/020_xpmpipethrough.diff create mode 100644 packages/lesstif/files/021_xim_chained_list_crash.diff create mode 100644 packages/lesstif/files/030_manpage.diff create mode 100644 packages/lesstif/files/ac_debug.m4.diff create mode 100644 packages/lesstif/files/ac_find_xft.m4.diff create mode 100644 packages/lesstif/files/ac_have_libxp.m4.diff create mode 100644 packages/lesstif/files/aclocal.m4.diff create mode 100644 packages/lesstif/files/disable-docs.patch create mode 100644 packages/lesstif/lesstif_0.95.0.bb diff --git a/packages/lesstif/files/000_bootstrap_script.diff b/packages/lesstif/files/000_bootstrap_script.diff new file mode 100644 index 0000000000..ca1a998700 --- /dev/null +++ b/packages/lesstif/files/000_bootstrap_script.diff @@ -0,0 +1,30 @@ +Index: lesstif1-1-0.93.94/bootstrap +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lesstif1-1-0.93.94/bootstrap 2006-05-26 17:36:58.000000000 +0200 +@@ -0,0 +1,25 @@ ++#! /bin/sh ++ ++for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x test/$x; done ++rm -Rf autom4te.cache ++ ++# Explain what we are doing from now ++set -x ++ ++libtoolize --copy --force ++aclocal-1.9 -I . ++autoconf ++autoheader ++automake-1.9 --foreign --add-missing --copy ++ ++cd test ++ ++libtoolize --copy --force ++aclocal-1.9 -I .. ++autoconf ++autoheader ++automake-1.9 --foreign --add-missing --copy ++ ++# Remove cruft that we no longer want ++rm -Rf autom4te.cache ++ diff --git a/packages/lesstif/files/000_libtool_linking.diff b/packages/lesstif/files/000_libtool_linking.diff new file mode 100644 index 0000000000..18a5bc57a4 --- /dev/null +++ b/packages/lesstif/files/000_libtool_linking.diff @@ -0,0 +1,11 @@ +--- lesstif2-0.94.4.orig/clients/Motif-2.1/mwm/Makefile.am ++++ lesstif2-0.94.4/clients/Motif-2.1/mwm/Makefile.am +@@ -37,7 +37,7 @@ + + appdir= $(libdir)/X11/app-defaults + +-mwmddir= $(libdir)/X11/mwm ++mwmddir= /etc/X11/mwm + mwmd_DATA= system.mwmrc alt.map README + + diff --git a/packages/lesstif/files/010_rebootstrap-small.diff b/packages/lesstif/files/010_rebootstrap-small.diff new file mode 100644 index 0000000000..8bf355fdb9 --- /dev/null +++ b/packages/lesstif/files/010_rebootstrap-small.diff @@ -0,0 +1,456 @@ +Index: lesstif2-0.95.0/ac_debug.m4 +=================================================================== +--- lesstif2-0.95.0.orig/ac_debug.m4 2004-02-01 16:49:40.000000000 +0100 ++++ lesstif2-0.95.0/ac_debug.m4 2006-07-11 11:11:36.000000000 +0200 +@@ -4,6 +4,90 @@ + dnl Source code which depends on this is mostly in + dnl DebugUtil.c/.h + dnl ++AC_DEFUN(LT_WITH_DMALLOC, ++[AC_MSG_CHECKING(if malloc debugging is wanted) ++AC_ARG_WITH(dmalloc, ++[ --with-dmalloc[=path] use dmalloc, see INSTALL(.html) for reference], ++[if test "$withval" = no; then ++ AC_MSG_RESULT(no) ++else ++dnl We overwrite the variables since we won't continue in ++dnl case of an error! ++dnl We modify CFLAGS, and also link libs (LDFLAGS) and programs (LIBS) ++ if test "$withval" != yes; then ++dnl a path was given ++ CFLAGS="$CFLAGS -I$withval/include -DDMALLOC_FUNC_CHECK" ++ ++ LDFLAGS="$LDFLAGS -L$withval/lib -ldmalloc" ++ LIBS="$LIBS -L$withval/lib -ldmalloc" ++ else ++dnl no path was given ++ CFLAGS="$CFLAGS -DDMALLOC_FUNC_CHECK" ++ LDFLAGS="$LDFLAGS -ldmalloc" ++ LIBS="$LIBS -ldmalloc" ++ fi ++ AC_TRY_LINK( ++ [#include ], ++ [char *ptr; ++ ptr=malloc(1); ++ free(ptr); ++ ], ++ [AC_DEFINE(WITH_DMALLOC,1, ++ [Define if using the dmalloc debugging malloc package]) ++ AC_MSG_RESULT(Using dmalloc)], ++ AC_MSG_ERROR(dmalloc not found) ++ ) ++fi], ++[AC_MSG_RESULT(no)]) ++]) ++ ++ ++dnl ++dnl Enable another malloc checker for debugging purposes ++dnl Source code which depends on this is mostly in ++dnl DebugUtil.c/.h ++dnl ++AC_DEFUN(LT_WITH_DBMALLOC, ++[AC_MSG_CHECKING(if malloc debugging is wanted) ++AC_ARG_WITH(dbmalloc, ++[ --with-dbmalloc[=path] use dbmalloc, see INSTALL(.html) for reference], ++[if test "$withval" = no; then ++ AC_MSG_RESULT(no) ++else ++dnl We overwrite the variables since we won't continue in ++dnl case of an error! ++dnl We modify CFLAGS, and also link libs (LDFLAGS) and programs (LIBS) ++ if test "$withval" != yes; then ++dnl a path was given ++ CFLAGS="$CFLAGS -I$withval/include" ++ ++ LDFLAGS="$LDFLAGS -L$withval/lib -ldbmalloc" ++ LIBS="$LIBS -L$withval/lib -ldbmalloc" ++ else ++dnl no path was given ++ LDFLAGS="$LDFLAGS -ldbmalloc" ++ LIBS="$LIBS -ldbmalloc" ++ fi ++ AC_TRY_LINK( ++ [#include ], ++ [char *ptr; ++ ptr=malloc(1); ++ free(ptr); ++ ], ++ [AC_DEFINE(WITH_DBMALLOC,1, ++ [Define if using the dbmalloc debugging malloc package]) ++ AC_MSG_RESULT(Using dbmalloc)], ++ AC_MSG_ERROR(dbmalloc not found) ++ ) ++fi], ++[AC_MSG_RESULT(no)]) ++]) ++dnl ++dnl Enable malloc checker for debugging purposes ++dnl See http://dmalloc.com, INSTALL(.html) for references to this. ++dnl Source code which depends on this is mostly in ++dnl DebugUtil.c/.h ++dnl + AC_DEFUN([LT_WITH_DMALLOC], + [AC_MSG_CHECKING(if malloc debugging is wanted) + AC_ARG_WITH(dmalloc, +Index: lesstif2-0.95.0/ac_find_xft.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ lesstif2-0.95.0/ac_find_xft.m4 2006-07-11 11:11:44.000000000 +0200 +@@ -0,0 +1,299 @@ ++dnl ++dnl $Header: /home/kobras/cvsroot/debian/lesstif1-1/ac_find_xft.m4,v 1.1 2004/05/27 10:48:25 kobras Exp $ ++dnl ++dnl $XFree86: xc/lib/fontconfig/configure.in,v 1.7 2002/08/01 15:57:25 keithp Exp $ ++dnl ++dnl Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. ++dnl Manipulated into AC_FIND_XFT macro by Danny Backx (also © 2002). ++dnl ++dnl Permission to use, copy, modify, distribute, and sell this software and its ++dnl documentation for any purpose is hereby granted without fee, provided that ++dnl the above copyright notice appear in all copies and that both that ++dnl copyright notice and this permission notice appear in supporting ++dnl documentation, and that the name of Keith Packard not be used in ++dnl advertising or publicity pertaining to distribution of the software without ++dnl specific, written prior permission. Keith Packard makes no ++dnl representations about the suitability of this software for any purpose. It ++dnl is provided "as is" without express or implied warranty. ++dnl ++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++dnl PERFORMANCE OF THIS SOFTWARE. ++dnl ++ ++AC_DEFUN(AC_FIND_XFT, ++[ ++AH_TEMPLATE([HAVE_FREETYPE], [We have the FreeType library]) ++AH_TEMPLATE([HAVE_FONTCONFIG], [We have the fontconfig library]) ++AH_TEMPLATE([HAVE_XRENDER], [We have the fontconfig library]) ++AH_TEMPLATE([FC_DEFAULT_FONTS], [We have the fontconfig library]) ++AH_TEMPLATE([X_FONT_DIR], [We have the fontconfig library]) ++AH_TEMPLATE([CONFDIR], [We have the fontconfig library]) ++AH_TEMPLATE([USE_XFT], [We have the fontconfig library]) ++ ++AC_ARG_WITH(freetype_includes, [ --with-freetype-includes=DIR Use FreeType includes in DIR], freetype_includes=$withval, freetype_includes=yes) ++AC_ARG_WITH(freetype_lib, [ --with-freetype-lib=DIR Use FreeType library in DIR], freetype_lib=$withval, freetype_lib=yes) ++AC_ARG_WITH(freetype_config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes) ++dnl AC_ARG_WITH(expat, [ --with-expat=DIR Use Expat in DIR], expat=$withval, expat=yes) ++dnl AC_ARG_WITH(expat_includes, [ --with-expat-includes=DIR Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes) ++dnl AC_ARG_WITH(expat_lib, [ --with-expat-lib=DIR Use Expat library in DIR], expat_lib=$withval, expat_lib=yes) ++AC_ARG_WITH(default_fonts, [ --with-default-fonts=DIR Use fonts from DIR when config is busted], defaultfonts="$withval", default_fonts=yes) ++dnl AC_ARG_WITH(confdir, [ --with-confdir=DIR Use DIR to store configuration files (default /etc/fonts)], confdir="$withval", confdir=yes) ++AC_ARG_WITH(fontconfig_includes, [ --with-fontconfig-includes=DIR Use Fontconfig includes in DIR], fontconfig_includes=$withval, fontconfig_includes=yes) ++AC_ARG_WITH(fontconfig_lib, [ --with-fontconfig-lib=DIR Use Fontconfig library in DIR], fontconfig_lib=$withval, fontconfig_lib=yes) ++AC_ARG_WITH(fontconfig_config, [ --with-fontconfig-config=PROG Use Fontconfig configuration program PROG], fontconfig_config=$withval, fontconfig_config=yes) ++AC_ARG_ENABLE(xrender, [ --enable-xrender Enable Xrender]) ++ ++# Using x libraries, set X font directory ++case "$no_x" in ++yes) ++ ;; ++*) ++ X_FONT_DIR="$x_libraries/X11/fonts" ++ AC_DEFINE_UNQUOTED(X_FONT_DIR,$X_FONT_DIR) ++ ;; ++esac ++AC_SUBST(X_FONT_DIR) ++ ++# ++# Check freetype configuration ++# ++case "$freetype_config" in ++no) ++ ;; ++yes) ++ AC_CHECK_PROG(ft_config,freetype-config,freetype-config,no) ++ ;; ++*) ++ ft_config="$freetype_config" ++ ;; ++esac ++ ++case "$freetype_includes" in ++no) ++ FREETYPE_CFLAGS="" ++ ;; ++yes) ++ case "$ft_config" in ++ no) ++ FREETYPE_CFLAGS="" ++ ;; ++ *) ++ FREETYPE_CFLAGS="`$ft_config --cflags`" ++ ;; ++ esac ++ ;; ++*) ++ FREETYPE_CFLAGS="-I$freetype_includes" ++ ;; ++esac ++ ++case "$freetype_lib" in ++no) ++ freetype_lib="" ++ ;; ++yes) ++ case "$ft_config" in ++ no) ++ freetype_lib="" ++ ;; ++ *) ++ freetype_lib="`$ft_config --libs`" ++ ;; ++ esac ++ ;; ++*) ++ freetype_lib="-L$freetype_lib -lfreetype" ++ ;; ++esac ++ ++saved_LIBS="$LIBS" ++LIBS="$LIBS $freetype_lib" ++saved_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" ++AC_CHECK_HEADERS(freetype/freetype.h) ++ ++HAVEFREETYPE="no" ++case "$ac_cv_header_freetype_freetype_h" in ++no) ++ CPPFLAGS="$saved_CPPFLAGS" ++ LIBS="$saved_LIBS" ++ ;; ++yes) ++ AC_CHECK_FUNCS(FT_Init_FreeType) ++ case "$ac_cv_func_FT_Init_FreeType" in ++ no) ++ CPPFLAGS="$saved_CPPFLAGS" ++ LIBS="$saved_LIBS" ++ ;; ++ yes) ++ HAVEFREETYPE="yes" ++ AC_DEFINE(HAVE_FREETYPE) ++ AC_SUBST(FREETYPE_CFLAGS) ++ ;; ++ esac ++ ;; ++esac ++ ++case "$default_fonts" in ++yes) ++ FC_DEFAULT_FONTS="/usr/share/fonts" ++ AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "/usr/share/fonts") ++ ;; ++*) ++ FC_DEFAULT_FONTS="$default_fonts" ++ AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "$default_fonts") ++ ;; ++esac ++ ++AC_SUBST(FC_DEFAULT_FONTS) ++ ++# ++# Set CONFDIR and FONTCONFIG_PATH ++# ++ ++case "$confdir" in ++no|yes) ++ confdir=/etc/fonts ++ ;; ++*) ++ ;; ++esac ++AC_SUBST(confdir) ++CONFDIR='${confdir}' ++AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR") ++AC_SUBST(CONFDIR) ++ ++# ++# Check X configuration ++# ++HAVEXRENDER="no" ++case "$enable_xrender" in ++no) ++ ;; ++*) ++ XRENDER_CFLAGS="-I$x_includes" ++ XRENDER_LIBS="-L$x_libraries -lXft -lXrender" ++ ++ saved_LIBS="$LIBS" ++ LIBS="$LIBS $XRENDER_LIBS" ++ saved_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS" ++ AC_CHECK_HEADERS(X11/extensions/Xrender.h) ++ ++ case "$ac_cv_header_X11_extensions_Xrender_h" in ++ no) ++ CPPFLAGS="$saved_CPPFLAGS" ++ LIBS="$saved_LIBS" ++ ;; ++ yes) ++ AC_CHECK_FUNCS(XRenderParseColor) ++ case "$ac_cv_func_XRenderParseColor" in ++ no) ++ CPPFLAGS="$saved_CPPFLAGS" ++ LIBS="$saved_LIBS" ++ ;; ++ yes) ++ HAVEXRENDER="yes" ++ AC_DEFINE(HAVE_XRENDER) ++ AC_SUBST(XRENDER_CFLAGS) ++ AC_SUBST(XRENDER_LIBS) ++ ;; ++ esac ++ ;; ++ esac ++ ++ ;; ++esac ++ ++# ++# Check fontconfig configuration ++# ++case "$fontconfig_config" in ++no) ++ ;; ++yes) ++ AC_CHECK_PROG(fc_config,fontconfig-config,fontconfig-config,no) ++ ;; ++*) ++ fc_config="$fontconfig_config" ++ ;; ++esac ++ ++case "$fontconfig_includes" in ++no) ++ FONTCONFIG_CFLAGS="" ++ ;; ++yes) ++ case "$fc_config" in ++ no) ++ FONTCONFIG_CFLAGS="" ++ ;; ++ *) ++ FONTCONFIG_CFLAGS="`$fc_config --cflags`" ++ ;; ++ esac ++ ;; ++*) ++ FONTCONFIG_CFLAGS="-I$fontconfig_includes" ++ ;; ++esac ++ ++case "$fontconfig_lib" in ++no) ++ fontconfig_lib="" ++ ;; ++yes) ++ case "$fc_config" in ++ no) ++ fontconfig_lib="" ++ ;; ++ *) ++ FONTCONFIG_LIBS="`$fc_config --libs`" ++ ;; ++ esac ++ ;; ++*) ++ FONTCONFIG_LIBS="-L$fontconfig_lib -lfontconfig" ++ ;; ++esac ++ ++saved_LIBS="$LIBS" ++LIBS="$LIBS $FONTCONFIG_LIBS" ++saved_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS" ++AC_CHECK_HEADERS(fontconfig/fontconfig.h) ++ ++case "$ac_cv_header_fontconfig_fontconfig_h" in ++no) ++ CPPFLAGS="$saved_CPPFLAGS" ++ LIBS="$saved_LIBS" ++ ;; ++yes) ++ AC_CHECK_FUNCS(FcInit) ++ case "$ac_cv_func_FcInit" in ++ no) ++ CPPFLAGS="$saved_CPPFLAGS" ++ LIBS="$saved_LIBS" ++ ;; ++ yes) ++ AC_DEFINE(HAVE_FONTCONFIG) ++ AC_SUBST(FONTCONFIG_CFLAGS) ++ AC_SUBST(FONTCONFIG_LIBS) ++ ;; ++ esac ++ ;; ++esac ++ ++dnl ++dnl Should this be conditionally defined ? ++dnl ++if test "$HAVEXRENDER" = "yes" -a "$HAVEFREETYPE" = "yes" ++then ++ AC_DEFINE(USE_XFT) ++fi ++]) +Index: lesstif2-0.95.0/ac_have_libxp.m4 +=================================================================== +--- lesstif2-0.95.0.orig/ac_have_libxp.m4 2004-02-01 16:49:40.000000000 +0100 ++++ lesstif2-0.95.0/ac_have_libxp.m4 2006-07-11 11:11:36.000000000 +0200 +@@ -11,6 +11,52 @@ + dnl Makefiles. Perhaps one should immediately add those libs + dnl to link commands which include libXm version2.1?! + dnl ++AC_DEFUN(LT_HAVE_LIBXP, ++[AC_REQUIRE([AC_PATH_X]) ++AC_CACHE_CHECK(whether libXp is available, lt_cv_libxp, ++[lt_save_CFLAGS="$CFLAGS" ++lt_save_CPPFLAGS="$CPPFLAGS" ++lt_save_LIBS="$LIBS" ++LIBS="$X_LIBS -lXp -lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" ++CFLAGS="$X_CFLAGS $CFLAGS" ++CPPFLAGS="$X_CFLAGS $CPPFLAGS" ++AC_TRY_LINK([ ++#include ++#include ++],[ ++Display *display=NULL; ++short major_version, minor_version; ++Status rc; ++rc=XpQueryVersion(display, &major_version, &minor_version); ++], ++lt_cv_libxp=yes, ++lt_cv_libxp=no) ++]) ++if test $lt_cv_libxp = yes; then ++ AC_DEFINE(HAVE_LIB_XP) ++ LT_HAVELIBXP=1 ++else ++ LT_HAVELIBXP=0 ++fi ++AM_CONDITIONAL(Have_Libxp, test "$lt_cv_libxp" = "yes") ++AC_SUBST(LT_HAVELIBXP) ++CFLAGS="$lt_save_CFLAGS" ++CPPFLAGS="$lt_save_CPPFLAGS" ++LIBS="$lt_save_LIBS" ++]) ++dnl ++dnl Check for libXp ++dnl In fact this check ensures that ++dnl - and ++dnl - both libXp and libXext ++dnl are in place ++dnl Perhaps AC_CHECK_LIB() could be used as well, but ++dnl requires the same amount of work to get all linker ++dnl flags and additional libraries specified. ++dnl If the test succeeds 'Have_Libxp' will be defined within our ++dnl Makefiles. Perhaps one should immediately add those libs ++dnl to link commands which include libXm version2.1?! ++dnl + AC_DEFUN([LT_HAVE_LIBXP], + [AC_REQUIRE([AC_PATH_X]) + AC_CACHE_CHECK(whether libXp is available, lt_cv_libxp, diff --git a/packages/lesstif/files/010_rebootstrap.diff b/packages/lesstif/files/010_rebootstrap.diff new file mode 100644 index 0000000000..90a0194890 --- /dev/null +++ b/packages/lesstif/files/010_rebootstrap.diff @@ -0,0 +1,69586 @@ +Index: lesstif2-0.95.0/autopackage/Makefile.in +=================================================================== +--- lesstif2-0.95.0.orig/autopackage/Makefile.in 2006-06-10 11:35:33.000000000 +0200 ++++ lesstif2-0.95.0/autopackage/Makefile.in 2006-07-11 11:12:09.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.4 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -51,8 +51,6 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/include/LTconfig.h + CONFIG_CLEAN_FILES = default.apspec +-depcomp = +-am__depfiles_maybe = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -102,6 +100,7 @@ + FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ + FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ + FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ ++GREP = @GREP@ + HTML2TEXT = @HTML2TEXT@ + Have_Exctags_FALSE = @Have_Exctags_FALSE@ + Have_Exctags_TRUE = @Have_Exctags_TRUE@ +@@ -164,6 +163,7 @@ + Version_2_1_TRUE = @Version_2_1_TRUE@ + XIsR6_FALSE = @XIsR6_FALSE@ + XIsR6_TRUE = @XIsR6_TRUE@ ++XMKMF = @XMKMF@ + XPLIB = @XPLIB@ + XRENDER_CFLAGS = @XRENDER_CFLAGS@ + XRENDER_LIBS = @XRENDER_LIBS@ +@@ -173,12 +173,10 @@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + YACC = @YACC@ +-ac_ct_AR = @ac_ct_AR@ ++YFLAGS = @YFLAGS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + ac_have_ctags = @ac_have_ctags@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +@@ -198,6 +196,9 @@ + confdir = @confdir@ + cp = @cp@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + extralibs = @extralibs@ + fc_config = @fc_config@ +@@ -207,12 +208,14 @@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + lib_version_suffix = @lib_version_suffix@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + man2html_cmd = @man2html_cmd@ + mandir = @mandir@ +@@ -220,8 +223,10 @@ + motif_includes = @motif_includes@ + motif_libraries = @motif_libraries@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + subdirs = @subdirs@ +@@ -249,9 +254,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps autopackage/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign autopackage/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign --ignore-deps autopackage/Makefile ++ $(AUTOMAKE) --foreign autopackage/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +Index: lesstif2-0.95.0/lib/config/Makefile.in +=================================================================== +--- lesstif2-0.95.0.orig/lib/config/Makefile.in 2006-06-10 11:35:39.000000000 +0200 ++++ lesstif2-0.95.0/lib/config/Makefile.in 2006-07-11 11:12:13.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.4 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -53,8 +53,6 @@ + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) +-depcomp = +-am__depfiles_maybe = + SOURCES = + DIST_SOURCES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +@@ -112,6 +110,7 @@ + FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ + FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ + FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ ++GREP = @GREP@ + HTML2TEXT = @HTML2TEXT@ + Have_Exctags_FALSE = @Have_Exctags_FALSE@ + Have_Exctags_TRUE = @Have_Exctags_TRUE@ +@@ -174,6 +173,7 @@ + Version_2_1_TRUE = @Version_2_1_TRUE@ + XIsR6_FALSE = @XIsR6_FALSE@ + XIsR6_TRUE = @XIsR6_TRUE@ ++XMKMF = @XMKMF@ + XPLIB = @XPLIB@ + XRENDER_CFLAGS = @XRENDER_CFLAGS@ + XRENDER_LIBS = @XRENDER_LIBS@ +@@ -183,12 +183,10 @@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + YACC = @YACC@ +-ac_ct_AR = @ac_ct_AR@ ++YFLAGS = @YFLAGS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + ac_have_ctags = @ac_have_ctags@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +@@ -208,6 +206,9 @@ + confdir = @confdir@ + cp = @cp@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + extralibs = @extralibs@ + fc_config = @fc_config@ +@@ -217,12 +218,14 @@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + lib_version_suffix = @lib_version_suffix@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + man2html_cmd = @man2html_cmd@ + mandir = @mandir@ +@@ -230,8 +233,10 @@ + motif_includes = @motif_includes@ + motif_libraries = @motif_libraries@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + subdirs = @subdirs@ +@@ -268,9 +273,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps lib/config/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/config/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign --ignore-deps lib/config/Makefile ++ $(AUTOMAKE) --foreign lib/config/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +Index: lesstif2-0.95.0/lib/Makefile.in +=================================================================== +--- lesstif2-0.95.0.orig/lib/Makefile.in 2006-06-10 11:35:38.000000000 +0200 ++++ lesstif2-0.95.0/lib/Makefile.in 2006-07-11 11:12:12.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.4 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -50,8 +50,6 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/include/LTconfig.h + CONFIG_CLEAN_FILES = +-depcomp = +-am__depfiles_maybe = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -109,6 +107,7 @@ + FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ + FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ + FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ ++GREP = @GREP@ + HTML2TEXT = @HTML2TEXT@ + Have_Exctags_FALSE = @Have_Exctags_FALSE@ + Have_Exctags_TRUE = @Have_Exctags_TRUE@ +@@ -171,6 +170,7 @@ + Version_2_1_TRUE = @Version_2_1_TRUE@ + XIsR6_FALSE = @XIsR6_FALSE@ + XIsR6_TRUE = @XIsR6_TRUE@ ++XMKMF = @XMKMF@ + XPLIB = @XPLIB@ + XRENDER_CFLAGS = @XRENDER_CFLAGS@ + XRENDER_LIBS = @XRENDER_LIBS@ +@@ -180,12 +180,10 @@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + YACC = @YACC@ +-ac_ct_AR = @ac_ct_AR@ ++YFLAGS = @YFLAGS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + ac_have_ctags = @ac_have_ctags@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +@@ -205,6 +203,9 @@ + confdir = @confdir@ + cp = @cp@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + extralibs = @extralibs@ + fc_config = @fc_config@ +@@ -214,12 +215,14 @@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + lib_version_suffix = @lib_version_suffix@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + man2html_cmd = @man2html_cmd@ + mandir = @mandir@ +@@ -227,8 +230,10 @@ + motif_includes = @motif_includes@ + motif_libraries = @motif_libraries@ + oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ ++psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + subdirs = @subdirs@ +@@ -263,9 +268,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps lib/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign --ignore-deps lib/Makefile ++ $(AUTOMAKE) --foreign lib/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -301,7 +306,13 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -313,7 +324,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +@@ -321,7 +332,13 @@ + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -342,7 +359,7 @@ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +Index: lesstif2-0.95.0/lib/Xm-2.1/Makefile.in +=================================================================== +--- lesstif2-0.95.0.orig/lib/Xm-2.1/Makefile.in 2006-06-10 11:35:39.000000000 +0200 ++++ lesstif2-0.95.0/lib/Xm-2.1/Makefile.in 2006-07-11 11:12:13.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.4 from Makefile.am. ++# Makefile.in generated by automake 1.9.6 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -14,8 +14,6 @@ + + @SET_MAKE@ + +-SOURCES = $(libXm_la_SOURCES) +- + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ +@@ -127,8 +125,8 @@ + am_libXm_la_OBJECTS = $(am__objects_5) + libXm_la_OBJECTS = $(am_libXm_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include +-depcomp = +-am__depfiles_maybe = ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +@@ -188,6 +186,7 @@ + FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ + FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ + FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ ++GREP = @GREP@ + HTML2TEXT = @HTML2TEXT@ + Have_Exctags_FALSE = @Have_Exctags_FALSE@ + Have_Exctags_TRUE = @Have_Exctags_TRUE@ +@@ -250,6 +249,7 @@ + Version_2_1_TRUE = @Version_2_1_TRUE@ + XIsR6_FALSE = @XIsR6_FALSE@ + XIsR6_TRUE = @XIsR6_TRUE@ ++XMKMF = @XMKMF@ + XPLIB = @XPLIB@ + XRENDER_CFLAGS = @XRENDER_CFLAGS@ + XRENDER_LIBS = @XRENDER_LIBS@ +@@ -259,12 +259,10 @@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + YACC = @YACC@ +-ac_ct_AR = @ac_ct_AR@ ++YFLAGS = @YFLAGS@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ + ac_have_ctags = @ac_have_ctags@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +@@ -284,6 +282,9 @@ + confdir = @confdir@ + cp = @cp@ + datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + extralibs = @extralibs@ + fc_config = @fc_config@ +@@ -293,12 +294,14 @@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ ++htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ + lib_version_suffix = @lib_version_suffix@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++localedir = @localedir@ + localstatedir = @localstatedir@ + man2html_cmd = @man2html_cmd@ + mandir = @mandir@ +