Skip to content

[idevicerestore] Fix libgen.h cannot be found #11074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil merged 2 commits into from
May 12, 2020
Merged

[idevicerestore] Fix libgen.h cannot be found #11074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc8315
[idevicerestore] Fix libgen.h cannot be found
Apr 29, 2020
810c562
Merge branch 'master' into dev/NancyLi/fix-idevicerestore
strega-nil May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/idevicerestore/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: idevicerestore
Version: 1.0.12-4
Description: Restore/upgrade firmware of iOS devices
Build-Depends: libimobiledevice, curl, libirecovery, libzip
Supports: !(windows)
Source: idevicerestore
Version: 1.0.12-4
Description: Restore/upgrade firmware of iOS devices
Build-Depends: libimobiledevice, curl, libirecovery, libzip
Supports: windows
32 changes: 32 additions & 0 deletions ports/idevicerestore/fix-libgen.h-cannot-be-found.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
diff --git a/src/common.c b/src/common.c
index afe1bc0..9219a8f 100644
--- a/src/common.c
+++ b/src/common.c
@@ -29,7 +29,9 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#ifndef _MSC_VER
#include <libgen.h>
+#endif
#include <time.h>

#include "common.h"
diff --git a/src/idevicerestore.c b/src/idevicerestore.c
index efa13c3..c17a2ba 100644
--- a/src/idevicerestore.c
+++ b/src/idevicerestore.c
@@ -38,12 +38,12 @@
#include <string.h>
#ifndef _MSC_VER
#include <unistd.h>
+#include <libgen.h>
#endif
#include <ctype.h>
#include <getopt.h>
#include <plist/plist.h>
#include <zlib.h>
-#include <libgen.h>

#include <curl/curl.h>

6 changes: 4 additions & 2 deletions ports/idevicerestore/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
include(vcpkg_common_functions)
vcpkg_fail_port_install(ON_TARGET "linux" "osx")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/idevicerestore
REF 1.0.12
SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915
HEAD_REF msvc-master
PATCHES libcurl_d.patch
PATCHES
libcurl_d.patch
fix-libgen.h-cannot-be-found.patch
)

vcpkg_install_msbuild(
Expand Down
2 changes: 2 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,8 @@ hypre:x64-osx=fail
icu:arm64-windows=fail
icu:arm-uwp=fail
icu:x64-uwp=fail
idevicerestore:x64-linux=fail
idevicerestore:x64-osx=fail
ignition-common1:x64-linux=fail
ignition-msgs1:arm64-windows=fail
ignition-msgs1:arm-uwp=fail
Expand Down