Friday, September 23, 2022

Re: [big-endian] unbreak games/mvdsv

On Thu, Sep 22, 2022 at 11:22:08PM -0400, George Koehler wrote:
> About mvdsv, the QuakeWorld server,

> I don't play this game, but I want to fix an error in CMakeLists.txt,
> which broke this package on big-endian platforms. kmos had added
> BROKEN-sparc64, but I got the same error on powerpc. This diff adds
> the missing PRIVATE keyword, so I can package mvdsv on powerpc.

> I didn't bump REVISION.
> ok to commit?

I can confirm it fixes sparc64.

ok kmos

--Kurt

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/mvdsv/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile 12 Sep 2022 00:29:05 -0000 1.7
> +++ Makefile 22 Sep 2022 18:40:01 -0000
> @@ -1,5 +1,3 @@
> -BROKEN-sparc64 = target_compile_definitions called with invalid arguments BIG_ENDIAN
> -
> COMMENT = QuakeWorld server
>
> GH_ACCOUNT = QW-Group
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/mvdsv/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 24 Aug 2022 03:24:32 -0000 1.1
> +++ patches/patch-CMakeLists_txt 22 Sep 2022 18:40:01 -0000
> @@ -1,5 +1,6 @@
> Remove link to dl as it is in OpenBSD's libc
> Have Cmake find and link to devel/pcre if installed, otherwise fall back to bundled pcre.
> +Prevent error in target_compile_definitions when big-endian
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> @@ -63,6 +64,15 @@ Index: CMakeLists.txt
> else()
> target_link_libraries(${PROJECT_NAME} ws2_32)
> target_link_libraries(${PROJECT_NAME} winmm)
> +@@ -135,7 +152,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE USE
> + include (TestBigEndian)
> + TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
> + if(IS_BIG_ENDIAN)
> +- target_compile_definitions(${PROJECT_NAME} __BIG_ENDIAN__Q__)
> ++ target_compile_definitions(${PROJECT_NAME} PRIVATE __BIG_ENDIAN__Q__)
> + message(STATUS "BIG_ENDIAN")
> + else()
> + target_compile_definitions(${PROJECT_NAME} PRIVATE __LITTLE_ENDIAN__Q__)
> @@ -147,6 +164,9 @@ if(CURL_FOUND)
> target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES})
> endif()

No comments:

Post a Comment