diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-16 16:52:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-20 15:30:46 +0000 |
| commit | 506c91cbc6a604a84e37e53ccff430436369802e (patch) | |
| tree | ced68acb293ee09194d12c0099405b77f2dfc2ff | |
| parent | fe03789d9555c025316325b559bbde40d5e770a8 (diff) | |
| download | openembedded-core-contrib-506c91cbc6a604a84e37e53ccff430436369802e.tar.gz | |
bitbake.conf: Drop oldincludedir
Autoconf defines this as:
"The directory for installing C header files for non-GCC compilers."
Whilst this is something autoconf does allow changing, I find it hard
to believe it has much use in the wild now and that headers don't get
split like this in reality, it would probably only be useful on really
old unixes.. The values are the same in our configuration anyway.
Drop the value and just use includedir everywhere.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
| -rw-r--r-- | meta/classes-recipe/autotools.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | meta/files/fs-perms-persistent-log.txt | 1 | ||||
| -rw-r--r-- | meta/files/fs-perms.txt | 1 | ||||
| -rw-r--r-- | meta/lib/oe/package.py | 3 |
5 files changed, 2 insertions, 6 deletions
diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index 5ed21a3d68..1663307b06 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass @@ -76,7 +76,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \ --localstatedir=${localstatedir} \ --libdir=${libdir} \ --includedir=${includedir} \ - --oldincludedir=${oldincludedir} \ + --oldincludedir=${includedir} \ --infodir=${infodir} \ --mandir=${mandir} \ --disable-silent-rules \ diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 67ff769046..8d04b71de3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -46,7 +46,6 @@ export sbindir = "${exec_prefix}/sbin" export libdir = "${exec_prefix}/${baselib}" export libexecdir = "${exec_prefix}/libexec" export includedir = "${exec_prefix}/include" -export oldincludedir = "${exec_prefix}/include" localedir = "${libdir}/locale" # Linkage between native/cross/nativesdk layouts diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt index 518c1be3c9..61f0a6e26a 100644 --- a/meta/files/fs-perms-persistent-log.txt +++ b/meta/files/fs-perms-persistent-log.txt @@ -38,7 +38,6 @@ ${datadir}/locale 0755 root root true 0644 root root # Cleanup headers ${includedir} 0755 root root true 0644 root root -${oldincludedir} 0755 root root true 0644 root root # Cleanup debug src /usr/src/debug 0755 root root true 0644 root root diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index daa4aed840..48191f504c 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -38,7 +38,6 @@ ${datadir}/locale 0755 root root true 0644 root root # Cleanup headers ${includedir} 0755 root root true 0644 root root -${oldincludedir} 0755 root root true 0644 root root # Cleanup debug src /usr/src/debug 0755 root root true 0644 root root diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 1dd20f85eb..f69bf9c353 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -456,8 +456,7 @@ def fixup_perms(d): 'sbindir', 'libexecdir', 'libdir', - 'includedir', - 'oldincludedir' ] + 'includedir' ] for path in target_path_vars: dir = d.getVar(path) or "" |