[oe-commits] org.oe.dev merge of '2b98fc6fe63ab6d8f550bd5e53546e27d970f533'
likewise commit
oe at amethyst.openembedded.net
Wed Jul 9 19:15:11 UTC 2008
merge of '2b98fc6fe63ab6d8f550bd5e53546e27d970f533'
and '6263ba0e14af7bb1eb9f572dc90726e8be06ae51'
Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 4ced2a6d71f9eeefb5a83f0584348d666b56065a
ViewMTN: http://monotone.openembedded.org/revision/info/4ced2a6d71f9eeefb5a83f0584348d666b56065a
Files:
1
conf/bitbake.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/sane-srcrevs.inc
packages/angstrom/angstrom-feed-configs.bb
packages/efl1/emotion_cvs.bb
packages/glibc/glibc_2.6.1.bb
packages/gnash/gnash-minimal.inc
packages/images/beagleboard-demo-image.bb
packages/initscripts/initscripts-1.0/arm/alignment.sh
packages/initscripts/initscripts_1.0.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/linux/linux-omap2-git/beagleboard/16bpp.patch
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/oprofile/oprofile_cvs.bb
packages/sl/sl_3.03.bb
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot_git.bb
packages/fastcgi/files
packages/fastcgi/files/link-against-math.patch
packages/fastcgi/fastcgi_2.4.0.bb
Diffs:
#
# mt diff -r2b98fc6fe63ab6d8f550bd5e53546e27d970f533 -r4ced2a6d71f9eeefb5a83f0584348d666b56065a
#
#
#
# patch "conf/bitbake.conf"
# from [1ed88e1003b951952075fb58350fd8c3b2feec06]
# to [d8122151bbc194ee830cb666879ae90585f1b985]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
# to [3713139bc7b46ff4bc175e324f936414dd660e59]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [154cf4002cbe5ab6684be25a30a6e81def502f90]
# to [50cf71bcebe08dea933ab20470606445ce693ae6]
#
# patch "packages/angstrom/angstrom-feed-configs.bb"
# from [eb9e83c8d5cdc3ec7d18e673a8c81e176e167f7d]
# to [2e7b80865ac098e14581cf6649712138efdd00e9]
#
# patch "packages/efl1/emotion_cvs.bb"
# from [07bb0f3a78b355b1d80ffc58470ee989fb34b92f]
# to [c3bd20586e6e23cf311985010d499d2fdbe8c247]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [72600385ebf1d9237fed74e0bae761983d19afb1]
# to [8b5e0d298c84d71b8a15be26527883a393e5483d]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [c3c53aff5fd4d52763504362f1899558f529a0db]
# to [8dabbe35069c1d216e834268bca9dfc522bdea92]
#
# patch "packages/images/beagleboard-demo-image.bb"
# from [507ade7d8a590c01ceaa55b6f7dd588a8661de6d]
# to [4d5ef75d06c67bfb38408d85c478c77ebb96e226]
#
# patch "packages/initscripts/initscripts-1.0/arm/alignment.sh"
# from [6544097304498250b8bf76912fe06533cb7298f0]
# to [d336093321228a687516f0c73273c6b339258ab8]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [f77c65c300bf290e8cd8506433653eba162768e6]
# to [5cc84fd6840a59197c8e43612fe543fcb5a7f446]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [dd10fa5af16341c9504880876d39902c3aba02ee]
# to [1799b75c52d54e2de8fc78a9840e6e6b6aee3d49]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [c403e04d11ced9d66b77bf4e3d4802cca1f2af17]
# to [e27798807882c21d2bef0aacd6bd9266938b92f7]
#
# patch "packages/linux/linux-omap2-git/beagleboard/16bpp.patch"
# from [0123ba7792705393accaa79de7b829b66864e02d]
# to [c1c18995aff8b6042396a23ef7d5dfb24d149444]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [b5d96a75522b12be8dd3e72cf081527c4d789b5c]
# to [57c2c0d28ca9963ed016ec055d47e1d2c288dbb4]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [78de2062a368bd176b37a4ce2ee3b2030df83a7e]
# to [2f55f24c8b5a337a34a74ae3b7f07fdbeb56fecd]
#
# patch "packages/oprofile/oprofile_cvs.bb"
# from [8762b088fad85c1082825ff1935df909accc4f05]
# to [edb973302312f12a0ef6a634e389951120ae626b]
#
# patch "packages/sl/sl_3.03.bb"
# from [65b10477e8415bafc447f72f2f3f3114e4ddf6e9]
# to [3ce9c8dd86bae848d681f80d4c11ae2485384b81]
#
# patch "packages/u-boot/u-boot-git/beagleboard/base.patch"
# from [df07530c211e06732f6a1cc29550d437d7995ccd]
# to [1135185807d979f189a4aa922827442a60400f0c]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [c152f9ec104c1fa4a53c08f9ad88de5ac58be2be]
# to [32b1019dfdf87033174dc1ae1adb1d36f6a8b300]
#
============================================================
--- conf/bitbake.conf 1ed88e1003b951952075fb58350fd8c3b2feec06
+++ conf/bitbake.conf d8122151bbc194ee830cb666879ae90585f1b985
@@ -380,7 +380,7 @@ ALLOWED_FLAGS = "-O -mcpu -march -pipe"
ALLOWED_FLAGS = "-O -mcpu -march -pipe"
# Pass parallel make options to the compile task only
-EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} "
+EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} "
##################################################################
# Optimization flags.
============================================================
--- conf/distro/include/angstrom-glibc.inc 64060b7ace4591e34cd8206bb5cd3ba77c6554d4
+++ conf/distro/include/angstrom-glibc.inc 3713139bc7b46ff4bc175e324f936414dd660e59
@@ -29,6 +29,8 @@ FULL_OPTIMIZATION_sparc = "-fexpensive-o
FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_pn-glibc_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -ftree-vectorize -O3"
+
BUILD_OPTIMIZATION = "-Os"
BUILD_OPTIMIZATION_pn-perl = "-O1"
BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"
============================================================
--- conf/distro/include/sane-srcrevs.inc 154cf4002cbe5ab6684be25a30a6e81def502f90
+++ conf/distro/include/sane-srcrevs.inc 50cf71bcebe08dea933ab20470606445ce693ae6
@@ -159,7 +159,7 @@ SRCREV_pn-opkg ?= "4488"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-opkg ?= "4488"
-SRCREV_pn-opkg-native ?= "4452"
+SRCREV_pn-opkg-native ?= "4491"
SRCREV_pn-opkg-sdk ?= "4488"
SRCREV_pn-oprofileui ?= "173"
SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
============================================================
--- packages/angstrom/angstrom-feed-configs.bb eb9e83c8d5cdc3ec7d18e673a8c81e176e167f7d
+++ packages/angstrom/angstrom-feed-configs.bb 2e7b80865ac098e14581cf6649712138efdd00e9
@@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for o
DESCRIPTION = "Configuration files for online package repositories aka feeds"
#PV = "${DISTRO_VERSION}"
-PR = "r5"
+PR = "r6"
PACKAGE_ARCH = "${MACHINE_ARCH}"
FEED_BASEPATH ?= "unstable/feed/"
============================================================
--- packages/efl1/emotion_cvs.bb 07bb0f3a78b355b1d80ffc58470ee989fb34b92f
+++ packages/efl1/emotion_cvs.bb c3bd20586e6e23cf311985010d499d2fdbe8c247
@@ -1,7 +1,7 @@ LICENSE = "MIT BSD"
DESCRIPTION = "The Enlightenment multimedia library"
LICENSE = "MIT BSD"
# we no longer build the libxine backend, since the gstreamer backend seems more promising
-DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
+DEPENDS = "libxcursor libxinerama eet evas ecore edje gstreamer gst-plugins-base"
PV = "0.1.0+cvs${SRCDATE}"
PR = "r1"
============================================================
--- packages/glibc/glibc_2.6.1.bb 72600385ebf1d9237fed74e0bae761983d19afb1
+++ packages/glibc/glibc_2.6.1.bb 8b5e0d298c84d71b8a15be26527883a393e5483d
@@ -1,5 +1,5 @@ require glibc.inc
require glibc.inc
-PR = "r6"
+PR = "r7"
ARM_INSTRUCTION_SET = "arm"
============================================================
--- packages/gnash/gnash-minimal.inc c3c53aff5fd4d52763504362f1899558f529a0db
+++ packages/gnash/gnash-minimal.inc 8dabbe35069c1d216e834268bca9dfc522bdea92
@@ -1,7 +1,7 @@ LICENSE = "GPL-2"
DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
-DEPENDS = "libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
S = ${WORKDIR}/gnash-${PV}
============================================================
--- packages/images/beagleboard-demo-image.bb 507ade7d8a590c01ceaa55b6f7dd588a8661de6d
+++ packages/images/beagleboard-demo-image.bb 4d5ef75d06c67bfb38408d85c478c77ebb96e226
@@ -19,7 +19,8 @@ IMAGE_INSTALL = "\
psplash \
e-wm exhibit \
xterm xmms epiphany-firefox-replacement \
- hicolor-icon-theme gnome-icon-theme \
+ swfdec-mozilla \
+ hicolor-icon-theme gnome-icon-theme \
jaaa nmap iperf gnuplot \
abiword \
# gnumeric \
============================================================
--- packages/initscripts/initscripts-1.0/arm/alignment.sh 6544097304498250b8bf76912fe06533cb7298f0
+++ packages/initscripts/initscripts-1.0/arm/alignment.sh d336093321228a687516f0c73273c6b339258ab8
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ -e /proc/cpu/alignment ]; then
+if [ -e /proc/cpu/alignment ] && ! [ $(uname -m) = "armv7l" ]; then
echo "3" > /proc/cpu/alignment
fi
============================================================
--- packages/initscripts/initscripts_1.0.bb f77c65c300bf290e8cd8506433653eba162768e6
+++ packages/initscripts/initscripts_1.0.bb 5cc84fd6840a59197c8e43612fe543fcb5a7f446
@@ -4,7 +4,7 @@ LICENSE = "GPL"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r105"
+PR = "r107"
SRC_URI = "file://functions \
file://halt \
============================================================
--- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb dd10fa5af16341c9504880876d39902c3aba02ee
+++ packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb 1799b75c52d54e2de8fc78a9840e6e6b6aee3d49
@@ -1,7 +1,7 @@ RDEPENDS = ""
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r18"
+PR = "r19"
inherit native
============================================================
--- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb c403e04d11ced9d66b77bf4e3d4802cca1f2af17
+++ packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb e27798807882c21d2bef0aacd6bd9266938b92f7
@@ -5,7 +5,7 @@ SRCDATE = "20050404"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r20.1"
+PR = "r21"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
============================================================
--- packages/linux/linux-omap2-git/beagleboard/16bpp.patch 0123ba7792705393accaa79de7b829b66864e02d
+++ packages/linux/linux-omap2-git/beagleboard/16bpp.patch c1c18995aff8b6042396a23ef7d5dfb24d149444
@@ -1,13 +1,137 @@
+diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
+index bdeb8fb..bf256f3 100644
+--- a/drivers/video/omap/Kconfig
++++ b/drivers/video/omap/Kconfig
+@@ -7,6 +7,27 @@ config FB_OMAP
+ help
+ Frame buffer driver for OMAP based boards.
+
++choice
++ depends on FB_OMAP && MACH_OMAP3_BEAGLE
++ prompt "Screen resolution"
++ default FB_OMAP_079M3R
++ help
++ Selected desired screen resolution
++
++config FB_OMAP_031M3R
++ boolean "640 x 480 @ 60 Hz Reduced blanking"
++
++config FB_OMAP_048M3R
++ boolean "800 x 600 @ 60 Hz Reduced blanking"
++
++config FB_OMAP_079M3R
++ boolean "1024 x 768 @ 60 Hz Reduced blanking"
++
++config FB_OMAP_092M9R
++ boolean "1280 x 720 @ 60 Hz Reduced blanking"
++
++endchoice
++
+ config FB_OMAP_LCDC_EXTERNAL
+ bool "External LCD controller support"
+ depends on FB_OMAP
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
-index 69d4e06..c1c4f4c 100644
+index 69d4e06..5e098c2 100644
--- a/drivers/video/omap/lcd_omap3beagle.c
+++ b/drivers/video/omap/lcd_omap3beagle.c
-@@ -66,7 +66,7 @@ struct lcd_panel omap3beagle_panel = {
+@@ -31,10 +31,6 @@
+
+ #define LCD_PANEL_ENABLE_GPIO 170
+
+-#define LCD_XRES 1024
+-#define LCD_YRES 768
+-#define LCD_PIXCLOCK 64000 /* in kHz */
+-
+ static int omap3beagle_panel_init(struct lcd_panel *panel,
+ struct omapfb_device *fbdev)
+ {
+@@ -65,19 +61,76 @@ static unsigned long omap3beagle_panel_get_caps(struct lcd_panel *panel)
+ struct lcd_panel omap3beagle_panel = {
.name = "omap3beagle",
.config = OMAP_LCDC_PANEL_TFT,
-
+-
- .bpp = 24,
+ .bpp = 16,
.data_lines = 24,
+- .x_res = LCD_XRES,
+- .y_res = LCD_YRES,
+- .hsw = 3, /* hsync_len (4) - 1 */
+- .hfp = 3, /* right_margin (4) - 1 */
+- .hbp = 39, /* left_margin (40) - 1 */
+- .vsw = 1, /* vsync_len (2) - 1 */
+- .vfp = 2, /* lower_margin */
+- .vbp = 7, /* upper_margin (8) - 1 */
+-
+- .pixel_clock = LCD_PIXCLOCK,
++
++#if defined CONFIG_FB_OMAP_031M3R
++
++ /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */
++ .x_res = 640,
++ .y_res = 480,
++ .hfp = 48,
++ .hsw = 32,
++ .hbp = 80,
++ .vfp = 3,
++ .vsw = 4,
++ .vbp = 7,
++ .pixel_clock = 23500,
++
++#elif defined CONFIG_FB_OMAP_048M3R
++
++ /* 800 x 600 @ 60 Hz Reduced blanking VESA CVT 0.48M3-R */
++ .x_res = 800,
++ .y_res = 600,
++ .hfp = 48,
++ .hsw = 32,
++ .hbp = 80,
++ .vfp = 3,
++ .vsw = 4,
++ .vbp = 11,
++ .pixel_clock = 35500,
++
++#elif defined CONFIG_FB_OMAP_079M3R
++
++ /* 1024 x 768 @ 60 Hz Reduced blanking VESA CVT 0.79M3-R */
++ .x_res = 1024,
++ .y_res = 768,
++ .hfp = 48,
++ .hsw = 32,
++ .hbp = 80,
++ .vfp = 3,
++ .vsw = 4,
++ .vbp = 15,
++ .pixel_clock = 56000,
++
++#elif defined CONFIG_FB_OMAP_092M9R
++
++ /* 1280 x 720 @ 60 Hz Reduced blanking VESA CVT 0.92M9-R */
++ .x_res = 1280,
++ .y_res = 720,
++ .hfp = 48,
++ .hsw = 32,
++ .hbp = 80,
++ .vfp = 3,
++ .vsw = 5,
++ .vbp = 13,
++ .pixel_clock = 64000,
++
++#else
++
++ /* use 640 x 480 if no config option */
++ /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */
++ .x_res = 640,
++ .y_res = 480,
++ .hfp = 48,
++ .hsw = 32,
++ .hbp = 80,
++ .vfp = 3,
++ .vsw = 4,
++ .vbp = 7,
++ .pixel_clock = 23500,
++
++#endif
+
+ .init = omap3beagle_panel_init,
+ .cleanup = omap3beagle_panel_cleanup,
+
- .x_res = LCD_XRES,
- .y_res = LCD_YRES,
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig b5d96a75522b12be8dd3e72cf081527c4d789b5c
+++ packages/linux/linux-omap2-git/beagleboard/defconfig 57c2c0d28ca9963ed016ec055d47e1d2c288dbb4
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.26-rc8-omap1
-# Fri Jul 4 09:57:18 2008
+# Sun Jul 6 15:22:47 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1225,6 +1225,10 @@ CONFIG_FB_OMAP=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FB_OMAP=y
+# CONFIG_FB_OMAP_031M3R is not set
+# CONFIG_FB_OMAP_048M3R is not set
+CONFIG_FB_OMAP_079M3R=y
+# CONFIG_FB_OMAP_092M9R is not set
# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4
============================================================
--- packages/linux/linux-omap2_git.bb 78de2062a368bd176b37a4ce2ee3b2030df83a7e
+++ packages/linux/linux-omap2_git.bb 2f55f24c8b5a337a34a74ae3b7f07fdbeb56fecd
@@ -5,7 +5,7 @@ PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCRE
SRCREV = "c32c81d59d2d8a66e63f82c9732db256d302068e"
PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
-PR = "r38"
+PR = "r39"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
file://defconfig"
============================================================
--- packages/oprofile/oprofile_cvs.bb 8762b088fad85c1082825ff1935df909accc4f05
+++ packages/oprofile/oprofile_cvs.bb edb973302312f12a0ef6a634e389951120ae626b
@@ -7,6 +7,8 @@ RDEPENDS = "binutils-symlinks"
DEPENDS = "popt binutils"
RDEPENDS = "binutils-symlinks"
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
file://opstart.patch;patch=1 \
file://acinclude.m4"
============================================================
--- packages/sl/sl_3.03.bb 65b10477e8415bafc447f72f2f3f3114e4ddf6e9
+++ packages/sl/sl_3.03.bb 3ce9c8dd86bae848d681f80d4c11ae2485384b81
@@ -1,4 +1,4 @@
-DESCRIPTION = "Corrects you if you type `sl' by mistake"
+DESCRIPTION = "Corrects you if you type sl by mistake"
SECTION = "console/games"
LICENSE = "unknown"
DEPENDS = "ncurses"
@@ -8,7 +8,7 @@ S = "${WORKDIR}/${P}.orig"
S = "${WORKDIR}/${P}.orig"
-LDFLAGS += "-lcurses"
+LDFLAGS += "-lncurses"
do_install() {
install -d ${D}${bindir}
============================================================
--- packages/u-boot/u-boot-git/beagleboard/base.patch df07530c211e06732f6a1cc29550d437d7995ccd
+++ packages/u-boot/u-boot-git/beagleboard/base.patch 1135185807d979f189a4aa922827442a60400f0c
@@ -1467,10 +1467,10 @@ new file mode 100644
+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */
diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c
new file mode 100644
-index 0000000..7d9a566
+index 0000000..0bdfb72
--- /dev/null
+++ b/board/omap3530beagle/omap3530beagle.c
-@@ -0,0 +1,388 @@
+@@ -0,0 +1,390 @@
+/*
+ * (C) Copyright 2004-2008
+ * Texas Instruments, <www.ti.com>
@@ -1740,6 +1740,8 @@ index 0000000..7d9a566
+ *((uint *) 0x49058094) = 0x00000506;
+ *((uint *) 0x49056094) = 0xF060F000;
+
++ /* set clksel_tv and clksel_dss1 */
++ *((uint *) 0x48004E40) = 0x00001002;
+ return (0);
+}
+
============================================================
--- packages/u-boot/u-boot_git.bb c152f9ec104c1fa4a53c08f9ad88de5ac58be2be
+++ packages/u-boot/u-boot_git.bb 32b1019dfdf87033174dc1ae1adb1d36f6a8b300
@@ -1,5 +1,5 @@ require u-boot.inc%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6263ba0e14af7bb1eb9f572dc90726e8be06ae51 -r4ced2a6d71f9eeefb5a83f0584348d666b56065a
#
#
#
# add_dir "packages/fastcgi/files"
#
# add_file "packages/fastcgi/files/link-against-math.patch"
# content [072e1afbda9f530c7274d0a7966543d862e4c5f3]
#
# patch "packages/fastcgi/fastcgi_2.4.0.bb"
# from [865f9d310ddf05e89de798145b06cce3ece5b683]
# to [2801e4594a4cb85ac3d88807719e4447918dc14d]
#
============================================================
--- packages/fastcgi/files/link-against-math.patch 072e1afbda9f530c7274d0a7966543d862e4c5f3
+++ packages/fastcgi/files/link-against-math.patch 072e1afbda9f530c7274d0a7966543d862e4c5f3
@@ -0,0 +1,26 @@
+Need to link against the C math library (-lm) at least for uclibc.
+
+Index: fcgi-2.4.0/cgi-fcgi/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/cgi-fcgi/Makefile.am 2008-07-09 20:54:56.000000000 +0200
++++ fcgi-2.4.0/cgi-fcgi/Makefile.am 2008-07-09 20:55:12.000000000 +0200
+@@ -11,5 +11,5 @@
+ LIBDIR = ../libfcgi
+ LIBFCGI = $(LIBDIR)/libfcgi.la
+
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c
+Index: fcgi-2.4.0/examples/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/examples/Makefile.am 2008-07-09 20:54:56.000000000 +0200
++++ fcgi-2.4.0/examples/Makefile.am 2008-07-09 20:55:11.000000000 +0200
+@@ -21,7 +21,7 @@
+ LIBDIR = ../libfcgi
+ LIBFCGI = $(LIBDIR)/libfcgi.la
+
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+
+ echo_SOURCES = $(INCLUDE_FILES) echo.c
+ echo_x_SOURCES = $(INCLUDE_FILES) echo-x.c
============================================================
--- packages/fastcgi/fastcgi_2.4.0.bb 865f9d310ddf05e89de798145b06cce3ece5b683
+++ packages/fastcgi/fastcgi_2.4.0.bb 2801e4594a4cb85ac3d88807719e4447918dc14d
@@ -1,8 +1,9 @@ DESCRIPTION = "Fast CGI backend (web ser
LICENSE = "Open Market"
DESCRIPTION = "Fast CGI backend (web server to CGI handler) library"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz"
+SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz \
+file://link-against-math.patch;patch=1"
S=${WORKDIR}/fcgi-${PV}
@@ -16,6 +17,3 @@ do_stage() {
autotools_stage_all
}
-do_compile() {
-}
-
More information about the Openembedded-commits
mailing list