Skip to content

Commit

Permalink
Remove proxy-libintl.wrap in glib2
Browse files Browse the repository at this point in the history
To make sure that if proxy-libintl dependency is not picked up, it wouldn't be built as a subproject and the build would just error out instead
  • Loading branch information
ViliusSutkus89 committed Dec 22, 2023
1 parent 6f73e53 commit 85fbfbe
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions glib2/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ tasks.prefab {

tasks.extractSrc {
doLast {
outDir.get().asFile.resolve("glib/meson.build").apply {
val srcDir = outDir.get().asFile

// Make sure not to build proxy-libintl subproject, it's already used as regular dependency
srcDir.resolve("subprojects/proxy-libintl.wrap").delete()

srcDir.resolve("glib/meson.build").apply {
writeText(
readText().replace(
"libraries : [libintl_deps],",
Expand All @@ -55,7 +60,7 @@ tasks.extractSrc {
// Patch inspired by (taken from):
// https://github.com/deltachat/deltachat-android/pull/2324
// fcntl only if epoll created successfully
outDir.get().asFile.resolve("gio/giounix-private.c").let {
srcDir.resolve("gio/giounix-private.c").let {
it.writeText(it.readText().replace(
"#include <sys/epoll.h>",
"""
Expand Down

0 comments on commit 85fbfbe

Please sign in to comment.