Sun Oct 6 17:02:10 2019 UTC ()
fix build of u-boot using pylibfdt on macOS.

u-boot.mk:
  pass PYTHON2, PYTHONCONFIG and PYTHONLIBPATH in ALL_ENV
patch-Makefile:
  make PYTHON2 overridable.  Add PYTHONCONFIG and BYTHONLIBPATH.
patch-lib_bch.c:
  #include <libkern/OSByteOrder.h> and use OSSwapHostToBigInt32
  as in u-boot master ab8fc41302 "fix compile error on macOS Mojave".
patch-scripts_dtc_pylibfdt_Makefile:
  determine PYTHONCLFAGS and PYTHONLIBS by asking PYTHONCONFIG.
  build PYTHONLDFLAGS from PYTHONLIBPATH and PYTHONLIBS
  add PYTHON{LD.C}FLAGS to LDFLAGS and CPPFLAGS in cmd_pymod.

bump PKGREVISION

tested with u-boot-nanopi-mi.


(bad)
diff -r1.19 -r1.20 pkgsrc/sysutils/u-boot/Makefile
diff -r1.27 -r1.28 pkgsrc/sysutils/u-boot/distinfo
diff -r1.20 -r1.21 pkgsrc/sysutils/u-boot/u-boot.mk
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot/patches/patch-Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/patches/patch-scripts_dtc_pylibfdt_Makefile
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/u-boot/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/Makefile 2019/07/13 17:42:01 1.19
+++ pkgsrc/sysutils/u-boot/Makefile 2019/10/06 17:02:10 1.20
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.19 2019/07/13 17:42:01 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.20 2019/10/06 17:02:10 bad Exp $
2# 2#
3 3
4.include "../../sysutils/u-boot/u-boot-version.mk" 4.include "../../sysutils/u-boot/u-boot-version.mk"
5 5
6DISTNAME= u-boot-${UBOOT_VERSION} 6DISTNAME= u-boot-${UBOOT_VERSION}
7PKGREVISION= 5 7PKGREVISION= 6
8CATEGORIES= meta-pkgs sysutils u-boot 8CATEGORIES= meta-pkgs sysutils u-boot
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10 10
11MAINTAINER= jmcneill@NetBSD.org 11MAINTAINER= jmcneill@NetBSD.org
12HOMEPAGE= https://www.denx.de/wiki/U-Boot 12HOMEPAGE= https://www.denx.de/wiki/U-Boot
13COMMENT= Das U-Boot, the Universal Boot Loader (meta-package) 13COMMENT= Das U-Boot, the Universal Boot Loader (meta-package)
14 14
15META_PACKAGE= yes 15META_PACKAGE= yes
16 16
17.include "options.mk" 17.include "options.mk"
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20DEPENDS+= u-boot-a10-olinuxino-lime-[0-9]*:../../sysutils/u-boot-a10-olinuxino-lime 20DEPENDS+= u-boot-a10-olinuxino-lime-[0-9]*:../../sysutils/u-boot-a10-olinuxino-lime
cvs diff -r1.27 -r1.28 pkgsrc/sysutils/u-boot/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo 2019/10/06 14:01:20 1.27
+++ pkgsrc/sysutils/u-boot/distinfo 2019/10/06 17:02:10 1.28
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.27 2019/10/06 14:01:20 bad Exp $ 1$NetBSD: distinfo,v 1.28 2019/10/06 17:02:10 bad Exp $
2 2
3SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 3SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
4RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 4RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
5SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff 5SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff
6Size (u-boot-2018.11.tar.bz2) = 13045125 bytes 6Size (u-boot-2018.11.tar.bz2) = 13045125 bytes
7SHA1 (patch-Makefile) = 068765a3e73fc0747d080cc7a5e2ff0b79e8fd9a 7SHA1 (patch-Makefile) = 5b86d70e05620cc3133faf508e983e2fe6ca6603
8SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9 8SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
9SHA1 (patch-arch_arm_dts_Makefile) = 184fdb8b04b25c0c827823779874306ce1bc746d 9SHA1 (patch-arch_arm_dts_Makefile) = 184fdb8b04b25c0c827823779874306ce1bc746d
10SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-m2-zero.dts) = aaa530a5f520eea0cb5dcece0b730e23db59eb40 10SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-m2-zero.dts) = aaa530a5f520eea0cb5dcece0b730e23db59eb40
11SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-p2-zero.dts) = 8c78d0e0877aa9784fa209af2e16e80cb1110364 11SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-p2-zero.dts) = 8c78d0e0877aa9784fa209af2e16e80cb1110364
12SHA1 (patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig) = 425ae3a82ce9006dbd734f41f7d49bb3587b1493 12SHA1 (patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig) = 425ae3a82ce9006dbd734f41f7d49bb3587b1493
13SHA1 (patch-configs_A20-OLinuXino-Lime2_defconfig) = 9eecb0a44ec9ddda2425b042c219f59ba546a494 13SHA1 (patch-configs_A20-OLinuXino-Lime2_defconfig) = 9eecb0a44ec9ddda2425b042c219f59ba546a494
14SHA1 (patch-configs_bananapi_m2_zero_defconfig) = 5e4baef63f0e51cb8c94a1dc0c0e50ecb016807d 14SHA1 (patch-configs_bananapi_m2_zero_defconfig) = 5e4baef63f0e51cb8c94a1dc0c0e50ecb016807d
15SHA1 (patch-configs_bananapi_p2_zero_defconfig) = 6468b3246cbf35d10320c8a974fc06b794ae68dc 15SHA1 (patch-configs_bananapi_p2_zero_defconfig) = 6468b3246cbf35d10320c8a974fc06b794ae68dc
16SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95 16SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95
17SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c 17SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c
18SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6 18SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
19SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4 19SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4
20SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8 20SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
21SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe 21SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe
22SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47 22SHA1 (patch-lib_bch.c) = 90ed120d00218ae79e317bc3c3019a04e68dbaeb
23SHA1 (patch-lib_efi__loader_efi__boottime.c) = 66aa3b95470a737154e6e082447aed0078092047 23SHA1 (patch-lib_efi__loader_efi__boottime.c) = 66aa3b95470a737154e6e082447aed0078092047
24SHA1 (patch-lib_efi__loader_efi__variable.c) = 1955870b22e358a4bded9e85fd89c74419aeed0d 24SHA1 (patch-lib_efi__loader_efi__variable.c) = 1955870b22e358a4bded9e85fd89c74419aeed0d
25SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = e312a372e393332191e715934279eb5e049ba008 25SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = 539a77db792bbd479b5c7cf81c0a8e114c859d9d
26SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042 26SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042
cvs diff -r1.20 -r1.21 pkgsrc/sysutils/u-boot/u-boot.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/u-boot.mk 2019/07/26 10:22:07 1.20
+++ pkgsrc/sysutils/u-boot/u-boot.mk 2019/10/06 17:02:10 1.21
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: u-boot.mk,v 1.20 2019/07/26 10:22:07 tnn Exp $ 1# $NetBSD: u-boot.mk,v 1.21 2019/10/06 17:02:10 bad Exp $
2 2
3.include "../../sysutils/u-boot/u-boot-version.mk" 3.include "../../sysutils/u-boot/u-boot-version.mk"
4 4
5PKGNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION:S/-/./} 5PKGNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION:S/-/./}
6DISTNAME?= u-boot-${UBOOT_VERSION} 6DISTNAME?= u-boot-${UBOOT_VERSION}
7DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot/distinfo 7DISTINFO_FILE?= ${.CURDIR}/../../sysutils/u-boot/distinfo
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9EXTRACT_SUFX?= .tar.bz2 9EXTRACT_SUFX?= .tar.bz2
10PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot/patches 10PATCHDIR?= ${.CURDIR}/../../sysutils/u-boot/patches
11 11
12HOMEPAGE?= https://www.denx.de/wiki/U-Boot 12HOMEPAGE?= https://www.denx.de/wiki/U-Boot
13MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/ 13MASTER_SITES?= ftp://ftp.denx.de/pub/u-boot/
14 14
15TOOL_DEPENDS+= dtc>=1.4.2:../../sysutils/dtc 15TOOL_DEPENDS+= dtc>=1.4.2:../../sysutils/dtc
16TOOL_DEPENDS+= swig>=1.3:../../devel/swig 16TOOL_DEPENDS+= swig>=1.3:../../devel/swig
17 17
18COMMENT= Das U-Boot, the Universal Boot Loader (${UBOOT_CONFIG}) 18COMMENT= Das U-Boot, the Universal Boot Loader (${UBOOT_CONFIG})
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
20 20
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_TOOLS+= bison gmake gsed pkg-config 22USE_TOOLS+= bison gmake gsed pkg-config
23PYTHON_FOR_BUILD_ONLY= yes 23PYTHON_FOR_BUILD_ONLY= yes
 24ALL_ENV+= PYTHON2=${PYTHONBIN} PYTHONCONFIG=${PYTHONCONFIG}
 25ALL_ENV+= PYTHONLIBPATH=-L$(LOCALBASE)/lib
24PYTHON_VERSIONS_ACCEPTED= 27 26PYTHON_VERSIONS_ACCEPTED= 27
25 27
26SUBST_CLASSES+= pythonpath 28SUBST_CLASSES+= pythonpath
27SUBST_STAGE.pythonpath= pre-configure 29SUBST_STAGE.pythonpath= pre-configure
28SUBST_FILES.pythonpath= tools/dtoc/dtoc 30SUBST_FILES.pythonpath= tools/dtoc/dtoc
29SUBST_SED.pythonpath= -e "s|/usr/bin/python|${PYTHONBIN}|g" 31SUBST_SED.pythonpath= -e "s|/usr/bin/python|${PYTHONBIN}|g"
30 32
31REPLACE_INTERPRETER+= python2 33REPLACE_INTERPRETER+= python2
32REPLACE.python2.old= python2 34REPLACE.python2.old= python2
33REPLACE.python2.new= ${PYTHONBIN} 35REPLACE.python2.new= ${PYTHONBIN}
34REPLACE_FILES.python2= scripts/fill_scrapyard.py \ 36REPLACE_FILES.python2= scripts/fill_scrapyard.py \
35 tools/binman/binman \ 37 tools/binman/binman \
36 tools/binman/binman.py \ 38 tools/binman/binman.py \
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/patches/patch-Makefile 2019/10/06 13:25:25 1.2
+++ pkgsrc/sysutils/u-boot/patches/patch-Makefile 2019/10/06 17:02:10 1.3
@@ -1,27 +1,38 @@ @@ -1,27 +1,38 @@
1$NetBSD: patch-Makefile,v 1.2 2019/10/06 13:25:25 bad Exp $ 1$NetBSD: patch-Makefile,v 1.3 2019/10/06 17:02:10 bad Exp $
2 2
3--- Makefile.orig 2018-11-14 16:10:06.000000000 +0000 3--- Makefile.orig 2018-11-14 16:10:06.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -1472,7 +1472,7 @@ prepare: prepare0 5@@ -359,7 +359,9 @@ YACC = bison
 6 AWK = awk
 7 PERL = perl
 8 PYTHON ?= python
 9-PYTHON2 = python2
 10+PYTHON2 ?= python2
 11+PYTHONCONFIG ?= $(PYTHON)-config
 12+PYTHONLIBPATH ?=#empty but overridable
 13 PYTHON3 = python3
 14 DTC ?= $(objtree)/scripts/dtc/dtc
 15 CHECK = sparse
 16@@ -1472,7 +1474,7 @@ prepare: prepare0
6  17
7 define filechk_version.h 18 define filechk_version.h
8 (echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \ 19 (echo \#define PLAIN_VERSION \"$(UBOOTRELEASE)\"; \
9- echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \ 20- echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION; \
10+ echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION \"$(UBOOT_PKGREVISION)\"; \ 21+ echo \#define U_BOOT_VERSION \"U-Boot \" PLAIN_VERSION \"$(UBOOT_PKGREVISION)\"; \
11 echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \ 22 echo \#define CC_VERSION_STRING \"$$(LC_ALL=C $(CC) --version | head -n 1)\"; \
12 echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; ) 23 echo \#define LD_VERSION_STRING \"$$(LC_ALL=C $(LD) --version | head -n 1)\"; )
13 endef 24 endef
14@@ -1619,12 +1619,12 @@ CHANGELOG: 25@@ -1619,12 +1621,12 @@ CHANGELOG:
15 # make distclean Remove editor backup files, patch leftover files and the like 26 # make distclean Remove editor backup files, patch leftover files and the like
16  27
17 # Directories & files removed with 'make clean' 28 # Directories & files removed with 'make clean'
18-CLEAN_DIRS += $(MODVERDIR) \ 29-CLEAN_DIRS += $(MODVERDIR) \
19+CLEAN_DIRS += $(MODVERDIR) SPL \ 30+CLEAN_DIRS += $(MODVERDIR) SPL \
20 $(foreach d, spl tpl, $(patsubst %,$d/%, \ 31 $(foreach d, spl tpl, $(patsubst %,$d/%, \
21 $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) 32 $(filter-out include, $(shell ls -1 $d 2>/dev/null))))
22  33
23 CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ 34 CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
24- boot* u-boot* MLO* SPL System.map fit-dtb.blob 35- boot* u-boot* MLO* SPL System.map fit-dtb.blob
25+ boot* u-boot* MLO* System.map fit-dtb.blob 36+ boot* u-boot* MLO* System.map fit-dtb.blob
26  37
27 # Directories & files removed with 'make mrproper' 38 # Directories & files removed with 'make mrproper'
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c 2017/10/08 12:09:43 1.3
+++ pkgsrc/sysutils/u-boot/patches/patch-lib_bch.c 2019/10/06 17:02:10 1.4
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1$NetBSD: patch-lib_bch.c,v 1.3 2017/10/08 12:09:43 jmcneill Exp $ 1$NetBSD: patch-lib_bch.c,v 1.4 2019/10/06 17:02:10 bad Exp $
2 2
3--- lib/bch.c.orig 2017-09-11 18:10:40.000000000 +0000 3--- lib/bch.c.orig 2018-11-14 16:10:06.000000000 +0000
4+++ lib/bch.c 4+++ lib/bch.c
5@@ -61,8 +61,10 @@ 5@@ -60,8 +60,11 @@
6 #include <linux/bitops.h> 6 #include <linux/bitops.h>
7 #else 7 #else
8 #include <errno.h> 8 #include <errno.h>
9-#if defined(__FreeBSD__) 9-#if defined(__FreeBSD__)
10+#if defined(__FreeBSD__) || defined(__NetBSD__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__)
11 #include <sys/endian.h> 11 #include <sys/endian.h>
12+#elif defined(__APPLE__) 12+#elif defined(__APPLE__)
13+#include <machine/endian.h> 13+#include <machine/endian.h>
 14+#include <libkern/OSByteOrder.h>
14 #else 15 #else
15 #include <endian.h> 16 #include <endian.h>
16 #endif 17 #endif
17@@ -71,7 +73,11 @@ 18@@ -70,7 +73,11 @@
18 #include <string.h> 19 #include <string.h>
19  20
20 #undef cpu_to_be32 21 #undef cpu_to_be32
21+#if defined(__APPLE__) 22+#if defined(__APPLE__)
22+#define cpu_to_be32 htonl 23+#define cpu_to_be32 OSSwapHostToBigInt32
23+#else 24+#else
24 #define cpu_to_be32 htobe32 25 #define cpu_to_be32 htobe32
25+#endif 26+#endif
26 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) 27 #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
27 #define kmalloc(size, flags) malloc(size) 28 #define kmalloc(size, flags) malloc(size)
28 #define kzalloc(size, flags) calloc(1, size) 29 #define kzalloc(size, flags) calloc(1, size)
29@@ -117,7 +123,7 @@ struct gf_poly_deg1 { 30@@ -116,7 +123,7 @@ struct gf_poly_deg1 {
30 }; 31 };
31  32
32 #ifdef USE_HOSTCC 33 #ifdef USE_HOSTCC
33-#if !defined(__DragonFly__) && !defined(__FreeBSD__) 34-#if !defined(__DragonFly__) && !defined(__FreeBSD__)
34+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__) 35+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
35 static int fls(int x) 36 static int fls(int x)
36 { 37 {
37 int r = 32; 38 int r = 32;
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot/patches/patch-scripts_dtc_pylibfdt_Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/patches/patch-scripts_dtc_pylibfdt_Makefile 2019/10/06 14:01:20 1.1
+++ pkgsrc/sysutils/u-boot/patches/patch-scripts_dtc_pylibfdt_Makefile 2019/10/06 17:02:10 1.2
@@ -1,26 +1,33 @@ @@ -1,26 +1,33 @@
1$NetBSD: patch-scripts_dtc_pylibfdt_Makefile,v 1.1 2019/10/06 14:01:20 bad Exp $ 1$NetBSD: patch-scripts_dtc_pylibfdt_Makefile,v 1.2 2019/10/06 17:02:10 bad Exp $
2 2
3--- scripts/dtc/pylibfdt/Makefile.orig 2018-11-14 16:10:06.000000000 +0000 3--- scripts/dtc/pylibfdt/Makefile.orig 2018-11-14 16:10:06.000000000 +0000
4+++ scripts/dtc/pylibfdt/Makefile 4+++ scripts/dtc/pylibfdt/Makefile
5@@ -13,6 +13,12 @@ include $(LIBFDT_srcdir)/Makefile.libfdt 5@@ -13,15 +13,25 @@ include $(LIBFDT_srcdir)/Makefile.libfdt
6 PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \ 6 PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
7 $(obj)/libfdt.i 7 $(obj)/libfdt.i
8  8
9+ifeq ($(KBUILD_VERBOSE),0) 9+ifeq ($(KBUILD_VERBOSE),0)
10+ pymod_quiet_flag = --quiet 10+ pymod_quiet_flag = --quiet
11+else 11+else
12+ pymod_quiet_flag = 12+ pymod_quiet_flag =
13+endif 13+endif
14+ 14+
 15+PYTHONCFLAGS := $(shell $(PYTHONCONFIG) --cflags)
 16+PYTHONLIBS := $(shell $(PYTHONCONFIG) --libs)
 17+PYTHONLDFLAGS := $(PYTHONLIBPATH) $(PYTHONLIBS)
 18+
15 quiet_cmd_pymod = PYMOD $@ 19 quiet_cmd_pymod = PYMOD $@
16 cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \ 20 cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \
17 CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \ 21 CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \
18@@ -21,7 +27,7 @@ quiet_cmd_pymod = PYMOD $@ 22- LDFLAGS="$(HOSTLDFLAGS)" \
19 CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \ 23+ LDFLAGS="$(HOSTLDFLAGS) $(PYTHONLDFLAGS)" \
 24 VERSION="u-boot-$(UBOOTVERSION)" \
 25- CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
 26+ CPPFLAGS="$(PYTHONCFLAGS) $(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
20 SOURCES="$(PYLIBFDT_srcs)" \ 27 SOURCES="$(PYLIBFDT_srcs)" \
21 SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \ 28 SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \
22- $(PYTHON) $< --quiet build_ext --inplace 29- $(PYTHON) $< --quiet build_ext --inplace
23+ $(PYTHON) $< $(pymod_quiet_flag) build_ext --inplace 30+ $(PYTHON) $< $(pymod_quiet_flag) build_ext --inplace
24  31
25 $(obj)/_libfdt.so: $(src)/setup.py $(PYLIBFDT_srcs) FORCE 32 $(obj)/_libfdt.so: $(src)/setup.py $(PYLIBFDT_srcs) FORCE
26 $(call if_changed,pymod) 33 $(call if_changed,pymod)