From c7588d79286d17ef338fd700e3a2ae536df9824e Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Fri, 6 Oct 2017 14:18:30 +0300
Subject: [PATCH] Use packages specified in .def files for platform libs

---
 backend.native/tests/link/default/default.kt                | 2 +-
 klib/platform.gradle                                        | 1 -
 samples/csvparser/src/main/kotlin/CsvParser.kt              | 2 +-
 samples/nonBlockingEchoServer/src/main/kotlin/EchoServer.kt | 2 +-
 samples/socket/src/main/kotlin/EchoServer.kt                | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend.native/tests/link/default/default.kt b/backend.native/tests/link/default/default.kt
index 1fa2e826928..3a39fec1d75 100644
--- a/backend.native/tests/link/default/default.kt
+++ b/backend.native/tests/link/default/default.kt
@@ -1,4 +1,4 @@
-import posix.*
+import platform.posix.*
 
 fun main(args: Array<String>) {
     // Just check the typealias is in scope.
diff --git a/klib/platform.gradle b/klib/platform.gradle
index 8ab1d736c6a..08b1d832ed6 100644
--- a/klib/platform.gradle
+++ b/klib/platform.gradle
@@ -15,7 +15,6 @@ List<String> libraries = gradle.startParameter.projectProperties.libraries.split
 konanInterop {
     "$taskName" {
         defFile gradle.startParameter.projectProperties.defFile
-        pkg gradle.startParameter.projectProperties.name
         target gradle.startParameter.projectProperties.target
         noDefaultLibs true
         extraOpts libraries.collectMany { ["-library",  "$konanHome/klib/$it"] }
diff --git a/samples/csvparser/src/main/kotlin/CsvParser.kt b/samples/csvparser/src/main/kotlin/CsvParser.kt
index 958ea3a01d5..00de0a6236c 100644
--- a/samples/csvparser/src/main/kotlin/CsvParser.kt
+++ b/samples/csvparser/src/main/kotlin/CsvParser.kt
@@ -15,7 +15,7 @@
  */
 
 import kotlinx.cinterop.*
-import posix.*
+import platform.posix.*
 
 fun parseLine(line: String, separator: Char) : List<String> {
     val result = mutableListOf<String>()
diff --git a/samples/nonBlockingEchoServer/src/main/kotlin/EchoServer.kt b/samples/nonBlockingEchoServer/src/main/kotlin/EchoServer.kt
index 7606a1b2eea..98ee2530f71 100644
--- a/samples/nonBlockingEchoServer/src/main/kotlin/EchoServer.kt
+++ b/samples/nonBlockingEchoServer/src/main/kotlin/EchoServer.kt
@@ -15,7 +15,7 @@
  */
 
 import kotlinx.cinterop.*
-import posix.*
+import platform.posix.*
 import kotlin.coroutines.experimental.*
 import kotlin.coroutines.experimental.intrinsics.*
 
diff --git a/samples/socket/src/main/kotlin/EchoServer.kt b/samples/socket/src/main/kotlin/EchoServer.kt
index 7f378e4375f..0afbaf1f765 100644
--- a/samples/socket/src/main/kotlin/EchoServer.kt
+++ b/samples/socket/src/main/kotlin/EchoServer.kt
@@ -15,7 +15,7 @@
  */
 
 import kotlinx.cinterop.*
-import posix.*
+import platform.posix.*
 
 fun main(args: Array<String>) {
     if (args.size < 1) {