Patch needed for new libcontext and FreeBSD

[Foo Barmann]

Hi,
I need the following patch to get the new libcontext stuff compiled under FreeBSD:

--- include/system/libcontext.h.orig 2017-03-08 13:29:09.028153000 +0100
+++ include/system/libcontext.h 2017-03-08 13:31:22.843111000 +0100
@@ -23,5 +23,5 @@

-#if defined(__GNUC__) || defined(__APPLE__)
+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)

     #define LIBCONTEXT_COMPILER_gcc
@@ -55,5 +55,5 @@
            #define LIBCONTEXT_CALL_CONVENTION __cdecl
        #endif
- #elif defined(__APPLE__) && defined(__MACH__)
+ #elif defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__)
        #if defined (__i386__)
            #define LIBCONTEXT_PLATFORM_apple_i386
@@ -62,4 +62,7 @@
            #define LIBCONTEXT_PLATFORM_apple_x86_64
            #define LIBCONTEXT_CALL_CONVENTION
+ #elif defined (__amd64__)
+ #define LIBCONTEXT_PLATFORM_apple_x86_64
+ #define LIBCONTEXT_CALL_CONVENTION
        #endif
     #endif

[Chris Pavlina (pavlina-chris)]

Thank you.

After building with this patch applied, have you tested pcbnew to verify that it works? In particular, can you switch between and use tools while the OpenGL or Cairo canvas is active?

[Foo Barmann (foo-barmann)]

Hi,
before I can test this change, I need to get kicad fully compiled which fails due to an unrelated change:
https://bugs.launchpad.net/kicad/+bug/1671086

After getting the whole thing compiled we can test the runtime behaviour...

[Foo Barmann (foo-barmann)]

Hi,
after kicad compiled again I could test the patch above (which compiled cleanly but didn't work).
The following patch compiles and works:

--- include/system/libcontext.h.orig 2017-03-13 11:47:23.495919000 +0100
+++ include/system/libcontext.h 2017-03-13 11:51:12.678651000 +0100
@@ -23,13 +23,15 @@

-#if defined(__GNUC__) || defined(__APPLE__)
+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)

     #define LIBCONTEXT_COMPILER_gcc

- #if defined(__linux__)
+ #if defined(__linux__) || defined(__FreeBSD__)
        #ifdef __x86_64__
            #define LIBCONTEXT_PLATFORM_linux_x86_64
            #define LIBCONTEXT_CALL_CONVENTION
-
+ #elif __amd64
+ #define LIBCONTEXT_PLATFORM_linux_x86_64
+ #define LIBCONTEXT_CALL_CONVENTION
        #elif __i386__
            #define LIBCONTEXT_PLATFORM_linux_i386

[Foo Barmann (foo-barmann)]

Hi,
__amd64__ missed two characters, here is a corrected patch:
--- include/system/libcontext.h.orig 2017-03-13 11:47:23.495919000 +0100
+++ include/system/libcontext.h 2017-03-13 11:51:12.678651000 +0100
@@ -23,13 +23,15 @@

-#if defined(__GNUC__) || defined(__APPLE__)
+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)

     #define LIBCONTEXT_COMPILER_gcc

- #if defined(__linux__)
+ #if defined(__linux__) || defined(__FreeBSD__)
        #ifdef __x86_64__
            #define LIBCONTEXT_PLATFORM_linux_x86_64
            #define LIBCONTEXT_CALL_CONVENTION
-
+ #elif __amd64__
+ #define LIBCONTEXT_PLATFORM_linux_x86_64
+ #define LIBCONTEXT_CALL_CONVENTION
        #elif __i386__
            #define LIBCONTEXT_PLATFORM_linux_i386

[Maciej Suminski (orsonmmz)]

Committed in 679074fd

[Mike (u20150417)]

Hi,
could it be that the FreeBSD part of the patch got lost during commit?

I still need the following to get kicad compiled for FreeBSD:

---- include/system/libcontext.h.orig 2017-03-13 11:47:23.495919000 +0100
-+++ include/system/libcontext.h 2017-03-13 11:51:12.678651000 +0100
-@@ -23,13 +23,15 @@
-
-
--#if defined(__GNUC__) || defined(__APPLE__)
-+#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)
-
- #define LIBCONTEXT_COMPILER_gcc
-
-- #if defined(__linux__)
-+ #if defined(__linux__) || defined(__FreeBSD__)
- #ifdef __x86_64__
- #define LIBCONTEXT_PLATFORM_linux_x86_64
- #define LIBCONTEXT_CALL_CONVENTION
--
-+ #elif __amd64__
-+ #define LIBCONTEXT_PLATFORM_linux_x86_64
-+ #define LIBCONTEXT_CALL_CONVENTION
- #elif __i386__
- #define LIBCONTEXT_PLATFORM_linux_i386

Greetings
---
Mike

[Chris Pavlina (pavlina-chris)]

As above, the patch got mangled! Still broken.

[KiCad Janitor (kicad-janitor)]

Fixed in revision 2206d51b82ab1353b33e78a18ebc4d6970ff05db
https://git.launchpad.net/kicad/patch/?id=2206d51b82ab1353b33e78a18ebc4d6970ff05db

[Maciej Suminski (orsonmmz)]

Right, I lost the patch while introducing other changes. I apologize for the mistake, it should be fine now.

[Foo Barmann (foo-barmann)]

Hi,
thanks alot for fixing!

Greetings
---
Mike

Am 28. Juli 2017 16:04:53 MESZ schrieb "Maciej Sumiński" <email address hidden>:
>Right, I lost the patch while introducing other changes. I apologize
>for
>the mistake, it should be fine now.
>
>--
>You received this bug notification because you are subscribed to the
>bug
>report.
>https://bugs.launchpad.net/bugs/1671083
>
>Title:
> Patch needed for new libcontext and FreeBSD
>
>Status in KiCad:
> Fix Committed
>
>Bug description:
> Hi,
>I need the following patch to get the new libcontext stuff compiled
>under FreeBSD:
>
>--- include/system/libcontext.h.orig 2017-03-08 13:29:09.028153000
>+0100
> +++ include/system/libcontext.h 2017-03-08 13:31:22.843111000 +0100
> @@ -23,5 +23,5 @@
>
>
> -#if defined(__GNUC__) || defined(__APPLE__)
> +#if defined(__GNUC__) || defined(__APPLE__) || defined(__FreeBSD__)
>
> #define LIBCONTEXT_COMPILER_gcc
> @@ -55,5 +55,5 @@
> #define LIBCONTEXT_CALL_CONVENTION __cdecl
> #endif
> - #elif defined(__APPLE__) && defined(__MACH__)
>+ #elif defined(__APPLE__) && defined(__MACH__) ||
>defined(__FreeBSD__)
> #if defined (__i386__)
> #define LIBCONTEXT_PLATFORM_apple_i386
> @@ -62,4 +62,7 @@
> #define LIBCONTEXT_PLATFORM_apple_x86_64
> #define LIBCONTEXT_CALL_CONVENTION
> + #elif defined (__amd64__)
> + #define LIBCONTEXT_PLATFORM_apple_x86_64
> + #define LIBCONTEXT_CALL_CONVENTION
> #endif
> #endif
>
>To manage notifications about this bug go to:
>https://bugs.launchpad.net/kicad/+bug/1671083/+subscriptions

--
Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet