On 2026/10/19 20:41, Robert Nagy wrote: > On 19/10/26 19:17 +0100, Stuart Henderson wrote: > > On 2026/10/19 19:26, Robert Nagy wrote: > > > why not just drop the headerextract thing and just depend on :patch > > > without > > > the flavor. wine is for amd64 only anyway so the machines should be fast. > > > > full extract is 2m12 vs 15s for just headers for me. seems a bit of > > a pain if you're doing rebuilds to work on the port... > > i think you forgot what ports i am working on ;-P
i know what ports you're working on, most people don't though ;) what was committed, i'm really not happy with. we could add the extra distfile directly to wine rather than via a flavour in llvm (and use EXTRACT_CASES), but i don't really want people to have to remember to update the version number after updating llvm, and I don't see a good way to pull it in otherwise. (you can't even do a horrible != construct because we don't know MODCLANG_VERSION until bsd.port.mk has been pulled in, but if you do it afterwards it breaks other things). anyway this is the minimum for me, but I'd really prefer to avoid avoiding extracting 184k totally useless files. Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/wine/Makefile,v diff -u -p -r1.48 Makefile --- Makefile 20 Oct 2026 14:50:46 -0000 1.48 +++ Makefile 20 Oct 2026 16:48:41 -0000 @@ -28,19 +28,14 @@ WANTLIB += lib/inotify/inotify lib/libpc # loaded with dlopen() WANTLIB += SDL2 cups dbus-1 gnutls netapi vulkan xkbregistry -# keep this in sync with MODCLANG_VERSION -# source for updates/new releases: https://thfr.gothub.org/wine-clang-pe-headers -CLANG_PE_HEADERS = 22.1.8 -DISTFILES.clang-pe-headers = wine-clang-pe-headers-${CLANG_PE_HEADERS}.tar.gz -SITES.clang-pe-headers = https://thfr.info/distfiles/ - SITES = https://dl.winehq.org/wine/source/11.x/ EXTRACT_SUFX = .tar.xz MODULES = lang/clang BUILD_DEPENDS = devel/bison \ - devel/nasm + devel/nasm \ + ${_MODCLANG_BUILD_DEPENDS}:patch RUN_DEPENDS = multimedia/gstreamer1/libav \ multimedia/gstreamer1/plugins-bad \ multimedia/gstreamer1/plugins-good \ @@ -157,9 +152,9 @@ SUBST_VARS+= CLANG_PE_RESOURCE MODCLANG pre-configure: ${INSTALL_DATA_DIR} ${CLANG_PE_RESOURCE}/include - cp -R ${CLANG_RESOURCE}/include/. ${CLANG_PE_RESOURCE}/include/ - cp ${WRKDIR}/wine-clang-pe-headers-${CLANG_PE_HEADERS}/*.h \ + cp ${WRKDIR}/devel/llvm/*/*/clang/lib/Headers/*.h \ ${CLANG_PE_RESOURCE}/include/ + cp -R ${CLANG_RESOURCE}/include/. ${CLANG_PE_RESOURCE}/include/ ln -sfh ${CLANG_RESOURCE}/lib ${CLANG_PE_RESOURCE}/lib ${SUBST_PROGRAM} ${FILESDIR}/clang-pe ${WRKDIR}/bin/clang-pe
