Skip to content

Commit 31906b3

Browse files
committed
reorder stuff for readline
1 parent 4e2d4f3 commit 31906b3

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

config/lib.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,15 @@
343343
],
344344
"cpp-library": true
345345
},
346+
"libedit": {
347+
"source": "libedit",
348+
"static-libs-unix": [
349+
"libedit.a"
350+
],
351+
"lib-depends": [
352+
"ncurses"
353+
]
354+
},
346355
"libevent": {
347356
"source": "libevent",
348357
"static-libs-unix": [

config/source.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,16 @@
489489
"path": "COPYING"
490490
}
491491
},
492+
"libedit": {
493+
"type": "filelist",
494+
"url": "https://thrysoee.dk/editline/",
495+
"regex": "/href=\"(?<file>libedit-(?<version>[^\"]+)\\.tar\\.gz)\"/",
496+
"provide-pre-built": true,
497+
"license": {
498+
"type": "file",
499+
"path": "COPYING"
500+
}
501+
},
492502
"libevent": {
493503
"type": "ghrel",
494504
"repo": "libevent/libevent",
@@ -946,16 +956,6 @@
946956
"path": "LICENSE"
947957
}
948958
},
949-
"libedit": {
950-
"type": "filelist",
951-
"url": "https://thrysoee.dk/editline/",
952-
"regex": "/href=\"(?<file>editline-(?<version>[^\"]+)\\.tar\\.gz)\"/",
953-
"provide-pre-built": true,
954-
"license": {
955-
"type": "file",
956-
"path": "COPYING"
957-
}
958-
},
959959
"readline": {
960960
"type": "filelist",
961961
"url": "https://ftp.gnu.org/pub/gnu/readline/",

src/SPC/builder/extension/readline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function patchBeforeConfigure(): bool
2323

2424
public function getUnixConfigureArg(bool $shared = false): string
2525
{
26-
return '--with-libedit=' . BUILD_ROOT_PATH . ' --without-readline';
26+
return '--with-libedit --without-readline';
2727
}
2828

2929
public function buildUnixShared(): void

src/SPC/builder/unix/library/libedit.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ trait libedit
1111
protected function build(): void
1212
{
1313
UnixAutoconfExecutor::create($this)
14-
->configure(
15-
'--with-curses'
16-
)
14+
->configure()
1715
->make();
1816
$this->patchPkgconfPrefix(['libedit.pc']);
1917
}

0 commit comments

Comments
 (0)