summaryrefslogtreecommitdiff
path: root/emulators/dynamips-community/files
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2017-09-22 11:43:13 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2017-09-22 11:43:13 +0000
commitae284d09e2bc41449c1bbfcf782e98a13d6579a1 (patch)
treeb2ce469a50035c4c4862c97651501df72ee6deb1 /emulators/dynamips-community/files
parentlang/myrddin: Update to 0.2.0 (diff)
emulators/dynamips-community: Update version 0.2.16=>0.2.17
- Add OPTION DOCS - Fix build with NOJIT [1] PR: 222047 [1] Reported by: openss.services@gmail.com [1]
Notes
Notes: svn path=/head/; revision=450356
Diffstat (limited to 'emulators/dynamips-community/files')
-rw-r--r--emulators/dynamips-community/files/patch-CMakeLists.txt11
-rw-r--r--emulators/dynamips-community/files/patch-common_dynamips.c32
-rw-r--r--emulators/dynamips-community/files/patch-common_net__io.c15
3 files changed, 32 insertions, 26 deletions
diff --git a/emulators/dynamips-community/files/patch-CMakeLists.txt b/emulators/dynamips-community/files/patch-CMakeLists.txt
deleted file mode 100644
index 3ace96c86f93..000000000000
--- a/emulators/dynamips-community/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2016-03-16 09:05:47 UTC
-+++ CMakeLists.txt
-@@ -32,7 +32,7 @@ include ( utils )
- include ( dependencies )
- include ( configure )
-
--if(APPLE)
-+if( APPLE OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") )
- include_directories(include /usr/local/include/)
- include_directories(include /opt/local/include/)
- endif()
diff --git a/emulators/dynamips-community/files/patch-common_dynamips.c b/emulators/dynamips-community/files/patch-common_dynamips.c
new file mode 100644
index 000000000000..60336bacc9e9
--- /dev/null
+++ b/emulators/dynamips-community/files/patch-common_dynamips.c
@@ -0,0 +1,32 @@
+--- common/dynamips.c.orig 2017-07-24 11:37:51 UTC
++++ common/dynamips.c
+@@ -190,7 +190,7 @@ static void show_usage(vm_instance_t *vm,int argc,char
+ "2691, 3725, 3745, 2600 or 1700) "
+ "(default: 7200)\n\n"
+ " -l <log_file> : Set logging file (default is %s)\n"
+- " -j : Disable the JIT compiler, very slow\n"
++/* " -j : Disable the JIT compiler, very slow\n" */
+ " --idle-pc <pc> : Set the idle PC (default: disabled)\n"
+ " --timer-itv <val> : Timer IRQ interval check (default: %u)\n"
+ "\n"
+@@ -394,7 +394,7 @@ static vm_instance_t *cli_create_instance(char *name,c
+ static int parse_std_cmd_line(int argc,char *argv[])
+ {
+ char *options_list =
+- "r:o:n:c:m:l:C:i:jt:p:s:k:T:U:A:B:a:f:E:b:S:R:M:eXP:N:G:g:L:I:";
++ "r:o:n:c:m:l:C:i:t:p:s:k:T:U:A:B:a:f:E:b:S:R:M:eXP:N:G:g:L:I:";
+ vm_platform_t *platform;
+ vm_instance_t *vm = NULL;
+ int instance_id;
+@@ -563,11 +563,6 @@ static int parse_std_cmd_line(int argc,char *argv[])
+ }
+
+ printf("Using a clock divisor of %d.\n",vm->clock_divisor);
+- break;
+-
+- /* Disable JIT */
+- case 'j':
+- vm->jit_use = FALSE;
+ break;
+
+ /* VM debug level */
diff --git a/emulators/dynamips-community/files/patch-common_net__io.c b/emulators/dynamips-community/files/patch-common_net__io.c
deleted file mode 100644
index d0e2daa11dce..000000000000
--- a/emulators/dynamips-community/files/patch-common_net__io.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- common/net_io.c.orig 2016-03-16 09:05:47 UTC
-+++ common/net_io.c
-@@ -609,9 +609,11 @@ static int netio_tap_open(char *tap_devn
- return(fd);
- #else
- int i,fd = -1;
-+ char tap_fullname[NETIO_DEV_MAXLEN];
-
- if (*tap_devname) {
-- fd = open(tap_devname,O_RDWR);
-+ snprintf(tap_fullname,NETIO_DEV_MAXLEN,"/dev/%s",tap_devname);
-+ fd = open(tap_fullname,O_RDWR);
- } else {
- for(i=0;i<16;i++) {
- snprintf(tap_devname,NETIO_DEV_MAXLEN,"/dev/tap%d",i);