Skip to content

Commit 52b33e4

Browse files
committed
Revert "Fixed curl failing to build for Windows"
Failed to apply this patch after dependency upgrades. Maybe it's fixed, or maybe we need to reapply it to resolve conflicts. ``` 16:24:44 if [ "mingw" = mingw ]; then patch -p1 < "/home/jenkins/workspace/testing-pr/label/PACKAGES_i386_mingw/libcurl/pkg"/fix-curl-windows.patch; fi 16:24:44 patching file configure 16:24:44 Hunk #1 FAILED at 41895. 16:24:44 Hunk #2 succeeded at 48695 (offset 310 lines). 16:24:44 1 out of 2 hunks FAILED -- saving rejects to file configure.rej ``` This reverts commit 4512cfe.
1 parent d6ba317 commit 52b33e4

2 files changed

Lines changed: 1 addition & 42 deletions

File tree

deps-packaging/libcurl/debian/rules

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ build: build-stamp
2424
build-stamp:
2525
dh_testdir
2626

27-
# Fixes following issue on Windows build
28-
# 15:44:06 url.c: In function 'zonefrom_url':
29-
# 15:44:06 url.c:1802:18: error: implicit declaration of function 'if_nametoindex' [-Werror=implicit-function-declaration]
30-
# 15:44:06 scopeidx = if_nametoindex(zoneid);
31-
# 15:44:06 ^
32-
if [ "$(OS)" = mingw ]; then patch -p1 < "$(CURDIR)"/fix-curl-windows.patch; fi
33-
3427
./configure --with-sysroot=$(PREFIX) \
3528
--host=$(DEB_HOST_GNU_TYPE) \
3629
--with-ssl=$(SSL_PREFIX) \
@@ -51,7 +44,7 @@ build-stamp:
5144
CPPFLAGS="-I$(PREFIX)/include" \
5245

5346
make
54-
47+
5548
touch build-stamp
5649

5750
install: build

deps-packaging/libcurl/fix-curl-windows.patch

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)