xf86-video-intel: Fix build with -fno-common
PATCH 1/2 xf86-video-intel: Fix build with -fno-common
--- ...0001-i810-Make-I810PatternROP-extern.patch | 29 +++++++++++++++++++ .../xorg-driver/xf86-video-intel_git.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch new file +29 -0
@@ -0,0 +1,29 @@ +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 5 Aug 2020 11:51:54 -0700 +Subject: [PATCH] i810: Make I810PatternROP extern + +Its also defined in i810_accel.c +Fixes build with -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/legacy/i810/i810.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h +index 347188c9..19be049c 100644 +--- a/src/legacy/i810/i810.h ++++ b/src/legacy/i810/i810.h +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen); + extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid); + + extern const int I810CopyROP[16]; +-const int I810PatternROP[16]; ++extern const int I810PatternROP[16]; + + #endif /* _I810_H_ */ +-- +2.28.0 +
meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +1 -0
@@ -15,6 +15,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \ + file://0001-i810-Make-I810PatternROP-extern.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.28.0
PATCH 2/2 libacpi: Fix build with -fno-common
--- ...1-libacpi-Fix-build-witth-fno-commom.patch | 68 +++++++++++++++++++ meta/recipes-bsp/libacpi/libacpi_0.2.bb | 4 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch
meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch new file +68 -0
@@ -0,0 +1,68 @@ +From 9839c169f513e65fc711646257b3e8588cce623c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 5 Aug 2020 12:06:01 -0700 +Subject: [PATCH] libacpi: Fix build witth -fno-commom + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + libacpi.c | 16 ++++++++++++++++ + libacpi.h | 6 +++--- + 2 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/libacpi.c b/libacpi.c +index 4e34725..9344ea4 100644 +--- a/libacpi.c ++++ b/libacpi.c +@@ -14,6 +14,22 @@ + #include "libacpi.h" + #include "list.h" + ++/** ++ * Array for existing batteries, loop until ++ * globals->battery_count ++ */ ++battery_t batteries[MAX_ITEMS]; ++/** ++ * Array for existing thermal zones, loop until ++ * globals->thermal_count ++ */ ++thermal_t thermals[MAX_ITEMS]; ++/** ++ * Array for existing fans, loop until ++ * globals->fan_count ++ */ ++fan_t fans[MAX_ITEMS]; ++ + static int read_acpi_battinfo(const int num); + static int read_acpi_battalarm(const int num); + static int read_acpi_battstate(const int num); +diff --git a/libacpi.h b/libacpi.h +index 9334b79..5242d3d 100644 +--- a/libacpi.h ++++ b/libacpi.h +@@ -183,17 +183,17 @@ typedef struct { + * Array for existing batteries, loop until + * globals->battery_count + */ +-battery_t batteries[MAX_ITEMS]; ++extern battery_t batteries[MAX_ITEMS]; + /** + * Array for existing thermal zones, loop until + * globals->thermal_count + */ +-thermal_t thermals[MAX_ITEMS]; ++extern thermal_t thermals[MAX_ITEMS]; + /** + * Array for existing fans, loop until + * globals->fan_count + */ +-fan_t fans[MAX_ITEMS]; ++extern fan_t fans[MAX_ITEMS]; + /** + * Finds existing batteries and fills the + * corresponding batteries structures with the paths +-- +2.28.0 +
meta/recipes-bsp/libacpi/libacpi_0.2.bb +3 -1
@@ -11,7 +11,9 @@ SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \ file://makefile-fix.patch \ file://libacpi_fix_for_x32.patch \ file://use_correct_strip_in_cross_environment.patch \ - file://ldflags.patch " + file://ldflags.patch \ + file://0001-libacpi-Fix-build-witth-fno-commom.patch \ + " SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c" SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
Signature · 1 line
2.28.0
Quoted 20 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- ...0001-i810-Make-I810PatternROP-extern.patch | 29 +++++++++++++++++++ .../xorg-driver/xf86-video-intel_git.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-
intel/0001-i810-Make-I810PatternROP-extern.patch(quoted diff) +0
-0i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-
driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patchnew file mode 100644
index 0000000000..610efd65d9meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +0
-0Make-I810PatternROP-extern.patch
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +1
-0@@ -0,0 +1,29 @@ +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:002001
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-
Quoted 8 lines
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +8
-0+From: Khem Raj <[email protected]> +Date: Wed, 5 Aug 2020 11:51:54 -0700 +Subject: [PATCH] i810: Make I810PatternROP extern + +Its also defined in i810_accel.c +Fixes build with -fno-common + +Upstream-Status: Pending
Should we take this exact same change so we can mark this as a backport?
Thanks,
Anuj
Quoted 37 lines
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +11
-0+Signed-off-by: Khem Raj <[email protected]> +--- + src/legacy/i810/i810.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h +index 347188c9..19be049c 100644 +--- a/src/legacy/i810/i810.h ++++ b/src/legacy/i810/i810.h +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen); + extern const OptionInfoRec *I810AvailableOptions(int chipid, intbusid);
+
+ extern const int I810CopyROP[16];
+-const int I810PatternROP[16];
++extern const int I810PatternROP[16];
+
+ #endif /* _I810_H_ */
+--
+2.28.0meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +1
-0+(quoted diff) +0
-0intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video- intel_git.bb
index7ab2236237..3c97b8c4f4100644meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +1
-0@@ -15,6 +15,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video- intel \ file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \ + file://0001-i810-Make-I810PatternROP-extern.patch \ "
UPSTREAM_CHECK_GITTAGREGEX= "(?P<pver>\d+(\.\d+)+)"
Quoted 34 lines · Anuj
Quoted 20 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- ...0001-i810-Make-I810PatternROP-extern.patch | 29 +++++++++++++++++++ .../xorg-driver/xf86-video-intel_git.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-
intel/0001-i810-Make-I810PatternROP-extern.patch(quoted diff) +0
-0i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-
driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patchnew file mode 100644
index 0000000000..610efd65d9meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +0
-0Make-I810PatternROP-extern.patch
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +1
-0@@ -0,0 +1,29 @@ +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:002001
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-
Quoted 8 lines
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +8
-0+From: Khem Raj <[email protected]> +Date: Wed, 5 Aug 2020 11:51:54 -0700 +Subject: [PATCH] i810: Make I810PatternROP extern + +Its also defined in i810_accel.c +Fixes build with -fno-common + +Upstream-Status: PendingShould we take this exact same change so we can mark this as a backport?
Quoted 1 line
I think that’s better will just add the backport bits and send v2
Quoted 43 lines
Thanks,
Anuj
Quoted 37 lines
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +11
-0+Signed-off-by: Khem Raj <[email protected]> +--- + src/legacy/i810/i810.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h +index 347188c9..19be049c 100644 +--- a/src/legacy/i810/i810.h ++++ b/src/legacy/i810/i810.h +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen); + extern const OptionInfoRec *I810AvailableOptions(int chipid, intbusid);
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810- new file +9
-0+ + extern const int I810CopyROP[16]; +-const int I810PatternROP[16]; ++extern const int I810PatternROP[16]; + + #endif /* _I810_H_ */ +-- +2.28.0 +(quoted diff) +0
-0intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video- intel_git.bb
index7ab2236237..3c97b8c4f4100644meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +1
-0@@ -15,6 +15,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video- intel \ file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \ + file://0001-i810-Make-I810PatternROP-extern.patch \ "
UPSTREAM_CHECK_GITTAGREGEX= "(?P<pver>\d+(\.\d+)+)"