diff --git a/srcpkgs/swiften/patches/fix-cross-build.patch b/srcpkgs/swiften/patches/fix-cross-build.patch index 906e60ce07d..c00178208a6 100644 --- a/srcpkgs/swiften/patches/fix-cross-build.patch +++ b/srcpkgs/swiften/patches/fix-cross-build.patch @@ -1,19 +1,19 @@ --- a/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:12.251340787 +0200 +++ b/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:49.165342691 +0200 -@@ -46,11 +46,11 @@ - if myenv["PLATFORM"] == "win32": - myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"]) +@@ -46,11 +46,11 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) : + if myenv["PLATFORM"] == "win32": + myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"]) -- if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin": -- conf = Configure(conf_env) -- if conf.CheckTypeSize("struct ip_mreqn", includes="#include ") == 0: -- myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"]) -- conf.Finish() -+ #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin": -+ # conf = Configure(conf_env) -+ # if conf.CheckTypeSize("struct ip_mreqn", includes="#include ") == 0: -+ # myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"]) -+ # conf.Finish() +- if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin": +- conf = Configure(conf_env) +- if conf.CheckTypeSize("struct ip_mreqn", includes="#include ") == 0: +- myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"]) +- conf.Finish() ++ #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin": ++ # conf = Configure(conf_env) ++ # if conf.CheckTypeSize("struct ip_mreqn", includes="#include ") == 0: ++ # myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"]) ++ # conf.Finish() - myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value( + myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value( """