Skip to contentSkip to conversation

package/exim: Fix compilation error with musl

PATCH New Luca Ceresoli 3 participants 4 messages Jul 25, 2015 – Jul 27, 2015

lore
Share & tools
lore

Luca Ceresoli

author
#0 lore raw

PATCH 1/1 package/exim: Fix compilation error with musl

From: Bernd Kuhls <[email protected]>

Fixes
smtp_in.c: In function ?smtp_start_session?:
smtp_in.c:1976:36: error: invalid application of ?sizeof? to incomplete type ?struct options?

     EXIM_SOCKLEN_T optlen = sizeof(struct ip_options) + MAX_IPOPTLEN;

smtp_in.c misdetects the needed style for ip_options, only OPTSTYLE == 2 works. Since musl does not provide any macro[1] to detect it we need to pretend to be darwin in order to fix the compile bug.

[1] http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F

Signed-off-by Bernd Kuhls <[email protected]>
[Luca: simplify by using only one sed invocation]
Signed-off-by Luca Ceresoli <[email protected]>

---

I'm adopting this oldish patch (https://patchwork.ozlabs.org/patch/460496/)
from Bernd. The bug it fixes is still there, and the fix is still valid. I just simplified it according to my comments to the original patch.

Changes v1 -> v2:
- simplify by using only one sed invocation (Luca).

---
 package/exim/exim.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)
package/exim/exim.mk +10 -0
index ed6a30997215..002ffd294fd8 100644
@@ -80,6 +80,15 @@ define EXIM_REMOVE_LIBNSL_FROM_MAKEFILE
 endef
 endif
 
+# musl does not provide struct ip_options nor struct ip_opts (but it is
+# available with both glibc and uClibc)
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+define EXIM_FIX_IP_OPTIONS_FOR_MUSL
+	$(SED) 's/#define GLIBC_IP_OPTIONS/#define DARWIN_IP_OPTIONS/' \
+		$(@D)/OS/os.h-Linux
+endef
+endif
+
 define EXIM_CONFIGURE_TOOLCHAIN
 	$(call exim-config-add,CC,$(TARGET_CC))
 	$(call exim-config-add,CFLAGS,$(TARGET_CFLAGS))

@@ -88,6 +97,7 @@ define EXIM_CONFIGURE_TOOLCHAIN
 	$(call exim-config-add,HOSTCC,$(HOSTCC))
 	$(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS))
 	$(EXIM_REMOVE_LIBNSL_FROM_MAKEFILE)
+	$(EXIM_FIX_IP_OPTIONS_FOR_MUSL)
 endef
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/exim: Fix compilation error with musl

Luca, Bernd, All,

On 2015-07-25 15:36 +0200, Luca Ceresoli spake thusly:

Quoted 11 lines

From: Bernd Kuhls <[email protected]>

Fixes
smtp_in.c: In function ?smtp_start_session?:
smtp_in.c:1976:36: error: invalid application of ?sizeof? to incomplete type ?struct options?

     EXIM_SOCKLEN_T optlen = sizeof(struct ip_options) + MAX_IPOPTLEN;

smtp_in.c misdetects the needed style for ip_options, only OPTSTYLE == 2 works. Since musl does not provide any macro[1] to detect it we need to pretend to be darwin in order to fix the compile bug.

Quoted 5 lines

[1] http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F

Signed-off-by Bernd Kuhls <[email protected]>
[Luca: simplify by using only one sed invocation]
Signed-off-by Luca Ceresoli <[email protected]>
Tested-by "Yann E. MORIN" <[email protected]>
[yann.morin.1998 at free.fr: build-tested only]
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 47 lines

---

I'm adopting this oldish patch (https://patchwork.ozlabs.org/patch/460496/)
from Bernd. The bug it fixes is still there, and the fix is still valid. I just simplified it according to my comments to the original patch.

Changes v1 -> v2:
- simplify by using only one sed invocation (Luca).

---
 package/exim/exim.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)
package/exim/exim.mk +10 -0
index ed6a30997215..002ffd294fd8 100644
@@ -80,6 +80,15 @@ define EXIM_REMOVE_LIBNSL_FROM_MAKEFILE
 endef
 endif
 
+# musl does not provide struct ip_options nor struct ip_opts (but it is
+# available with both glibc and uClibc)
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+define EXIM_FIX_IP_OPTIONS_FOR_MUSL
+	$(SED) 's/#define GLIBC_IP_OPTIONS/#define DARWIN_IP_OPTIONS/' \
+		$(@D)/OS/os.h-Linux
+endef
+endif
+
 define EXIM_CONFIGURE_TOOLCHAIN
 	$(call exim-config-add,CC,$(TARGET_CC))
 	$(call exim-config-add,CFLAGS,$(TARGET_CFLAGS))

@@ -88,6 +97,7 @@ define EXIM_CONFIGURE_TOOLCHAIN
 	$(call exim-config-add,HOSTCC,$(HOSTCC))
 	$(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS))
 	$(EXIM_REMOVE_LIBNSL_FROM_MAKEFILE)
+	$(EXIM_FIX_IP_OPTIONS_FOR_MUSL)
 endef
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),)
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/exim: Fix compilation error with musl

In reply to Luca Ceresoli

Dear Luca Ceresoli,

Quoted 17 lines · Luca Ceresoli

From: Bernd Kuhls <[email protected]>

Fixes
smtp_in.c: In function ?smtp_start_session?:
smtp_in.c:1976:36: error: invalid application of ?sizeof? to incomplete type ?struct options?

     EXIM_SOCKLEN_T optlen = sizeof(struct ip_options) + MAX_IPOPTLEN;

smtp_in.c misdetects the needed style for ip_options, only OPTSTYLE == 2 works. Since musl does not provide any macro[1] to detect it we need to pretend to be darwin in order to fix the compile bug.

[1] http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F

Signed-off-by Bernd Kuhls <[email protected]>
[Luca: simplify by using only one sed invocation]
Signed-off-by Luca Ceresoli <[email protected]>
Quoted 5 lines

---

I'm adopting this oldish patch (https://patchwork.ozlabs.org/patch/460496/)
from Bernd. The bug it fixes is still there, and the fix is still valid. I just simplified it according to my comments to the original patch.

Thanks for picking up an old patch, definitely useful! I'm not too happy with us pretending to be Darwin when building against Musl, as it could fire back on us in the future (like if Exim starts using something really Darwin specific). But oh well, I guess it's good enough for now.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 1/1 package/exim: Fix compilation error with musl

Dear Thomas,

Quoted 26 lines · Thomas Petazzoni

Dear Luca Ceresoli,

Quoted 17 lines · Luca Ceresoli

From: Bernd Kuhls <[email protected]>

Fixes
smtp_in.c: In function ?smtp_start_session?:
smtp_in.c:1976:36: error: invalid application of ?sizeof? to incomplete type ?struct options?

      EXIM_SOCKLEN_T optlen = sizeof(struct ip_options) + MAX_IPOPTLEN;

smtp_in.c misdetects the needed style for ip_options, only OPTSTYLE == 2 works. Since musl does not provide any macro[1] to detect it we need to pretend to be darwin in order to fix the compile bug.

[1] http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F

Signed-off-by Bernd Kuhls <[email protected]>
[Luca: simplify by using only one sed invocation]
Signed-off-by Luca Ceresoli <[email protected]>
Quoted 5 lines

---

I'm adopting this oldish patch (https://patchwork.ozlabs.org/patch/460496/)
from Bernd. The bug it fixes is still there, and the fix is still valid. I just simplified it according to my comments to the original patch.

Quoted 5 lines

Thanks for picking up an old patch, definitely useful! I'm not too happy with us pretending to be Darwin when building against Musl, as it could fire back on us in the future (like if Exim starts using something really Darwin specific). But oh well, I guess it's good enough for now.

Indeed.

Actually, for the sake of _building_, setting NO_IP_OPTIONS instead of DARWIN_IP_OPTIONS would be fine as well. But it would result in OPTSTYLE to be set to 3, not 2. Bernd, do you think it would work anyway?

For the curious, the *_IP_OPTIONS defines are only referenced in this file:

http://git.exim.org/exim.git/blob/HEAD:/src/src/smtp_in.c#l1961

where there's a lengthy commentary about the headaches with the various C libraries.

Signature · 1 line
Luca