Skip to content

Commit ea4ef4e

Browse files
bassosimonebassosimone
authored
fix(buildtool): let libevent use OpenSSL's pkgconfig (#1369)
This diff modifies `./internal/cmd/buildtool` to (1) stop removing OpenSSL's pkgconfig, (2) use such a pkgconfig during libevent's `./configure` step, and (3) make sure libevent's install does not remove OpenSSL's pkgconfig. We're implementing changes (1) and (2) because libevent fails to properly configure for iOS if you have a system with homebrew with OpenSSL@3 installed. Unless we force the `PKG_CONFIG_PATH`, libevent's `configure` uses the OpenSSL@3 headers and library installed with homebrew rather than the ones we cross compiled. Change (3) is there because otherwise we cannot recompile libevent without recompiling OpenSSL, since the libevent build fails unless we have a suitable OpenSSL pkgconfig, as explained before. This diff was extracted and refined from #1366. The reference issue is: ooni/probe#2564.
1 parent 347e3cd commit ea4ef4e

File tree

6 files changed

+181
-49
lines changed

6 files changed

+181
-49
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ require (
145145
github.com/xtaci/kcp-go/v5 v5.6.2 // indirect
146146
github.com/xtaci/smux v1.5.24 // indirect
147147
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
148-
golang.org/x/mod v0.12.0 // indirect
148+
golang.org/x/mod v0.13.0 // indirect
149149
golang.org/x/term v0.13.0 // indirect
150150
golang.org/x/text v0.13.0 // indirect
151-
golang.org/x/tools v0.13.0 // indirect
151+
golang.org/x/tools v0.14.0 // indirect
152152
google.golang.org/protobuf v1.31.0 // indirect
153153
)

‎go.sum

+5-5
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
588588
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
589589
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
590590
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
591-
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
592-
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
591+
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
592+
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
593593
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
594594
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
595595
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -626,7 +626,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
626626
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
627627
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
628628
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
629-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
629+
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
630630
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
631631
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
632632
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -718,8 +718,8 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK
718718
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
719719
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
720720
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
721-
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
722-
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
721+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
722+
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
723723
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
724724
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
725725
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/cmd/buildtool/android_test.go

+124-32
Original file line numberDiff line numberDiff line change
@@ -754,12 +754,6 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
754754
"DESTDIR=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm",
755755
"install_dev",
756756
},
757-
}, {
758-
Env: []string{},
759-
Argv: []string{
760-
"rm", "-rf",
761-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig",
762-
},
763757
}, {
764758
Env: []string{},
765759
Argv: []string{
@@ -815,12 +809,6 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
815809
"DESTDIR=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64",
816810
"install_dev",
817811
},
818-
}, {
819-
Env: []string{},
820-
Argv: []string{
821-
"rm", "-rf",
822-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig",
823-
},
824812
}, {
825813
Env: []string{},
826814
Argv: []string{
@@ -876,12 +864,6 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
876864
"DESTDIR=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386",
877865
"install_dev",
878866
},
879-
}, {
880-
Env: []string{},
881-
Argv: []string{
882-
"rm", "-rf",
883-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig",
884-
},
885867
}, {
886868
Env: []string{},
887869
Argv: []string{
@@ -937,12 +919,6 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
937919
"DESTDIR=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64",
938920
"install_dev",
939921
},
940-
}, {
941-
Env: []string{},
942-
Argv: []string{
943-
"rm", "-rf",
944-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig",
945-
},
946922
}},
947923
}}
948924

@@ -1045,6 +1021,7 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
10451021
"CXXFLAGS=-fdata-sections -ffunction-sections -fstack-protector-strong -funwind-tables -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -fpic -mthumb -Oz -DANDROID",
10461022
"-I"+faketopdir+"/internal/cmd/buildtool/internal/libtor/android/arm/include",
10471023
),
1024+
"PKG_CONFIG_PATH=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig",
10481025
},
10491026
Argv: []string{
10501027
"./configure",
@@ -1077,8 +1054,36 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
10771054
Env: []string{},
10781055
Argv: []string{
10791056
"rm",
1080-
"-rf",
1081-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig",
1057+
"-f",
1058+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig/libevent.pc",
1059+
},
1060+
}, {
1061+
Env: []string{},
1062+
Argv: []string{
1063+
"rm",
1064+
"-f",
1065+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig/libevent_core.pc",
1066+
},
1067+
}, {
1068+
Env: []string{},
1069+
Argv: []string{
1070+
"rm",
1071+
"-f",
1072+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig/libevent_extra.pc",
1073+
},
1074+
}, {
1075+
Env: []string{},
1076+
Argv: []string{
1077+
"rm",
1078+
"-f",
1079+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig/libevent_openssl.pc",
1080+
},
1081+
}, {
1082+
Env: []string{},
1083+
Argv: []string{
1084+
"rm",
1085+
"-f",
1086+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm/lib/pkgconfig/libevent_pthreads.pc",
10821087
},
10831088
}, {
10841089
Env: []string{},
@@ -1195,6 +1200,7 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
11951200
"CXXFLAGS=-fdata-sections -ffunction-sections -fstack-protector-strong -funwind-tables -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -fpic -O2 -DANDROID",
11961201
"-I"+faketopdir+"/internal/cmd/buildtool/internal/libtor/android/arm64/include",
11971202
),
1203+
"PKG_CONFIG_PATH=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig",
11981204
},
11991205
Argv: []string{
12001206
"./configure",
@@ -1227,8 +1233,36 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
12271233
Env: []string{},
12281234
Argv: []string{
12291235
"rm",
1230-
"-rf",
1231-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig",
1236+
"-f",
1237+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig/libevent.pc",
1238+
},
1239+
}, {
1240+
Env: []string{},
1241+
Argv: []string{
1242+
"rm",
1243+
"-f",
1244+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig/libevent_core.pc",
1245+
},
1246+
}, {
1247+
Env: []string{},
1248+
Argv: []string{
1249+
"rm",
1250+
"-f",
1251+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig/libevent_extra.pc",
1252+
},
1253+
}, {
1254+
Env: []string{},
1255+
Argv: []string{
1256+
"rm",
1257+
"-f",
1258+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig/libevent_openssl.pc",
1259+
},
1260+
}, {
1261+
Env: []string{},
1262+
Argv: []string{
1263+
"rm",
1264+
"-f",
1265+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/arm64/lib/pkgconfig/libevent_pthreads.pc",
12321266
},
12331267
}, {
12341268
Env: []string{},
@@ -1345,6 +1379,7 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
13451379
"CXXFLAGS=-fdata-sections -ffunction-sections -fstack-protector-strong -funwind-tables -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -fPIC -O2 -DANDROID -mstackrealign",
13461380
"-I"+faketopdir+"/internal/cmd/buildtool/internal/libtor/android/386/include",
13471381
),
1382+
"PKG_CONFIG_PATH=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig",
13481383
},
13491384
Argv: []string{
13501385
"./configure",
@@ -1377,8 +1412,36 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
13771412
Env: []string{},
13781413
Argv: []string{
13791414
"rm",
1380-
"-rf",
1381-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig",
1415+
"-f",
1416+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig/libevent.pc",
1417+
},
1418+
}, {
1419+
Env: []string{},
1420+
Argv: []string{
1421+
"rm",
1422+
"-f",
1423+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig/libevent_core.pc",
1424+
},
1425+
}, {
1426+
Env: []string{},
1427+
Argv: []string{
1428+
"rm",
1429+
"-f",
1430+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig/libevent_extra.pc",
1431+
},
1432+
}, {
1433+
Env: []string{},
1434+
Argv: []string{
1435+
"rm",
1436+
"-f",
1437+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig/libevent_openssl.pc",
1438+
},
1439+
}, {
1440+
Env: []string{},
1441+
Argv: []string{
1442+
"rm",
1443+
"-f",
1444+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/386/lib/pkgconfig/libevent_pthreads.pc",
13821445
},
13831446
}, {
13841447
Env: []string{},
@@ -1495,6 +1558,7 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
14951558
"CXXFLAGS=-fdata-sections -ffunction-sections -fstack-protector-strong -funwind-tables -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -fPIC -O2 -DANDROID",
14961559
"-I"+faketopdir+"/internal/cmd/buildtool/internal/libtor/android/amd64/include",
14971560
),
1561+
"PKG_CONFIG_PATH=" + faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig",
14981562
},
14991563
Argv: []string{
15001564
"./configure",
@@ -1527,8 +1591,36 @@ func TestAndroidBuildCdepsLibevent(t *testing.T) {
15271591
Env: []string{},
15281592
Argv: []string{
15291593
"rm",
1530-
"-rf",
1531-
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig",
1594+
"-f",
1595+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig/libevent.pc",
1596+
},
1597+
}, {
1598+
Env: []string{},
1599+
Argv: []string{
1600+
"rm",
1601+
"-f",
1602+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig/libevent_core.pc",
1603+
},
1604+
}, {
1605+
Env: []string{},
1606+
Argv: []string{
1607+
"rm",
1608+
"-f",
1609+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig/libevent_extra.pc",
1610+
},
1611+
}, {
1612+
Env: []string{},
1613+
Argv: []string{
1614+
"rm",
1615+
"-f",
1616+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig/libevent_openssl.pc",
1617+
},
1618+
}, {
1619+
Env: []string{},
1620+
Argv: []string{
1621+
"rm",
1622+
"-f",
1623+
faketopdir + "/internal/cmd/buildtool/internal/libtor/android/amd64/lib/pkgconfig/libevent_pthreads.pc",
15321624
},
15331625
}, {
15341626
Env: []string{},

‎internal/cmd/buildtool/cdepslibevent.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ func cdepsLibeventBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependenci
4949
}
5050
envp := cBuildExportAutotools(cBuildMerge(globalEnv, localEnv))
5151

52+
// On iOS, we need PKG_CONFIG_PATH to convince libevent to use the OpenSSL we built and
53+
// always letting libevent's configure use pkgconfig is actually fine.
54+
envp.Append("PKG_CONFIG_PATH", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig"))
55+
5256
argv := runtimex.Try1(shellx.NewArgv("./configure"))
5357
if globalEnv.CONFIGURE_HOST != "" {
5458
argv.Append("--host=" + globalEnv.CONFIGURE_HOST)
@@ -59,7 +63,17 @@ func cdepsLibeventBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependenci
5963
must.Run(log.Log, "make", "V=1", "-j", strconv.Itoa(runtime.NumCPU()))
6064
must.Run(log.Log, "make", "DESTDIR="+globalEnv.DESTDIR, "install")
6165
must.Run(log.Log, "rm", "-rf", filepath.Join(globalEnv.DESTDIR, "bin"))
62-
must.Run(log.Log, "rm", "-rf", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig"))
66+
67+
// We used to delete the whole pkgconfig directory but libevent's build needs OpenSSL's
68+
// pkgconfig, so removing the whole directory means rebuilding libevent requires building
69+
// OpenSSL because its pkgconfig is also removed. We discovered this need when working
70+
// on the https://github.com/ooni/probe-cli/pull/1366 MVP. To keep the build idempotent,
71+
// let's be more gentle and just remove libevent's pkgconfig files instead.
72+
must.Run(log.Log, "rm", "-f", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig", "libevent.pc"))
73+
must.Run(log.Log, "rm", "-f", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig", "libevent_core.pc"))
74+
must.Run(log.Log, "rm", "-f", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig", "libevent_extra.pc"))
75+
must.Run(log.Log, "rm", "-f", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig", "libevent_openssl.pc"))
76+
must.Run(log.Log, "rm", "-f", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig", "libevent_pthreads.pc"))
6377

6478
// we just need libevent.a
6579
must.Run(log.Log, "rm", "-rf", filepath.Join(globalEnv.DESTDIR, "lib", "libevent.la"))

‎internal/cmd/buildtool/cdepsopenssl.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,8 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
8282
))
8383

8484
must.Run(log.Log, "make", "DESTDIR="+globalEnv.DESTDIR, "install_dev")
85-
must.Run(log.Log, "rm", "-rf", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig"))
85+
86+
// We used to delete the pkgconfig but it turns out this is important for libevent iOS builds, which
87+
// means now we need to keep it. See https://github.com/ooni/probe-cli/pull/1369 for details.
88+
//must.Run(log.Log, "rm", "-rf", filepath.Join(globalEnv.DESTDIR, "lib", "pkgconfig"))
8689
}

‎internal/cmd/buildtool/linuxcdeps_test.go

+31-8
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,6 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
136136
"DESTDIR=" + faketopdir + "/" + sysDepDestDir,
137137
"install_dev",
138138
},
139-
}, {
140-
Env: []string{},
141-
Argv: []string{
142-
"rm", "-rf",
143-
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig",
144-
},
145139
}},
146140
}, {
147141
name: "we can build libevent",
@@ -195,6 +189,7 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
195189
faketopdir,
196190
sysDepDestDir,
197191
),
192+
"PKG_CONFIG_PATH=" + faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig",
198193
},
199194
Argv: []string{
200195
"./configure",
@@ -226,8 +221,36 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
226221
Env: []string{},
227222
Argv: []string{
228223
"rm",
229-
"-rf",
230-
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig",
224+
"-f",
225+
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig/libevent.pc",
226+
},
227+
}, {
228+
Env: []string{},
229+
Argv: []string{
230+
"rm",
231+
"-f",
232+
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig/libevent_core.pc",
233+
},
234+
}, {
235+
Env: []string{},
236+
Argv: []string{
237+
"rm",
238+
"-f",
239+
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig/libevent_extra.pc",
240+
},
241+
}, {
242+
Env: []string{},
243+
Argv: []string{
244+
"rm",
245+
"-f",
246+
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig/libevent_openssl.pc",
247+
},
248+
}, {
249+
Env: []string{},
250+
Argv: []string{
251+
"rm",
252+
"-f",
253+
faketopdir + "/" + sysDepDestDir + "/lib/pkgconfig/libevent_pthreads.pc",
231254
},
232255
}, {
233256
Env: []string{},

0 commit comments

Comments
 (0)